Merge branch 'master' into gh-pages

.travis.yml

@@ -1,4 +1,6 @@
 language: node_js
 node_js:
- - "0.10.13"
+ - "0.10"
+before_script:
+ - "./node_modules/.bin/bower update"
 script: grunt test

README.rst

@@ -50,10 +50,6 @@ Tests
 We use behavior-driven tests written with jasmine.js_. They can run in your
 browser or in the command line via phantom.js_.
 
-We use `Travis-CI`_ for continuous integration.
-
-.. image:: https://api.travis-ci.org/jcbrand/converse.js.png?branch=master
-
 -------------
 Documentation
 -------------