diff --git a/.travis.yml b/.travis.yml
index dec23a8..6619cc6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,28 @@
-# Copyright 2014 The CGMath Developers. For a full listing of the authors,
-# refer to the AUTHORS file at the top-level directory of this distribution.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+sudo: false
 
 language: rust
 
 rust:
-  - 1.0.0-beta.4
-  - nightly
+  # - nightly
+  - beta
+  - stable
 
 env:
   global:
-    - secure: S0l5RmsFJgbDdzXjHsCluexb1R9RklpxZMJgr9RcieeqSqaJDPUht53yBZDyuk04/KzEbtM5yxogJd2tcv2E4EogPLL8oG77GItNc/i6jy4TLUjU28WKOMiBvYA/1rhb7f/DEQgj7DtIHP/rQGKH8goUdJfqGbk7EawP7FSxC2Y=
-script:
-  - cargo build
-  - cargo test
-  - cargo doc
-after_script:
-  # the doc directory needs to be in the root for rust-ci
-  - mv target/doc doc
-  - curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh
+    secure: afYeHpC8BJeyajd3vd84xRBYJKxQorKfh4lGvesu/hqh0bHc6lxrqGt0Pthb2m2YDODZiGSbx9yr9UetelZIJUSA3LoiG5PdDrtH/Kwdn5xGcBWSZl3v/sH+oB3AeR7Eji6mj0mrydQxn8PQbEACvR6lpGCYE2R48KrftYmD6Js=
 
-# http://docs.travis-ci.com/user/workers/container-based-infrastructure/
-sudo: false
+before_script:
+  - |
+      pip install 'travis-cargo<0.2' --user &&
+      export PATH=$HOME/.local/bin:$PATH
+
+script:
+  - |
+      travis-cargo build &&
+      travis-cargo test &&
+      travis-cargo bench &&
+      travis-cargo --only stable doc
+
+after_success:
+  - |
+      travis-cargo --only stable doc-upload
diff --git a/Cargo.toml b/Cargo.toml
index f0f0cd9..864c263 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "cgmath"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Brendan Zabarauskas <bjzaba@yahoo.com.au>",
         "Brian Heylin",
         "Colin Sherratt",
@@ -13,10 +13,14 @@ authors = ["Brendan Zabarauskas <bjzaba@yahoo.com.au>",
         "Pierre Krieger",
         "Tomasz Stachowiak"
 ]
-license="Apache-2.0"
-description="A linear algebra and mathematics library for computer graphics."
-homepage="https://github.com/bjz/cgmath-rs"
-repository="https://github.com/bjz/cgmath-rs"
+license = "Apache-2.0"
+description = "A linear algebra and mathematics library for computer graphics."
+
+documentation = "http://bjz.github.io/cgmath-rs"
+homepage = "https://github.com/bjz/cgmath-rs"
+repository = "https://github.com/bjz/cgmath-rs"
+
+keywords = ["gamedev", "math", "matrix", "vector", "quaternion"]
 
 [lib]
 name = "cgmath"
diff --git a/README.md b/README.md
index b24f9cd..66c6a41 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
 # cgmath-rs
 
-[![Build Status](https://travis-ci.org/bjz/cgmath-rs.png?branch=master)](https://travis-ci.org/bjz/cgmath-rs)
+[![Build Status](https://img.shields.io/travis/bjz/cgmath-rs.svg)](https://travis-ci.org/bjz/cgmath-rs)
+[![Crates.io](http://meritbadge.herokuapp.com/cgmath)](https://crates.io/crates/cgmath)
+
+[Documentation](http://bjz.github.io/cgmath-rs)
 
 A linear algebra and mathematics library for computer graphics.
 
@@ -26,10 +29,6 @@ is not fully covered by the testsuite. If you encounter any mistakes or
 omissions please let me know by posting an issue, or even better: send me a
 pull request with a fix.
 
-## Documentation
-
-[View](http://rust-ci.org/bjz/cgmath-rs/doc/cgmath/index.html)
-
 ## Limitations
 
 cgmath is _not_ an n-dimensional library and is aimed at computer graphics