Merge branch 'develop' into feature/html_tags

.travis.yml

@@ -0,0 +1,6 @@
+language: python
+python:
+    - "2.7"
+    - "3.3"
+install:  python setup.py build
+script:   python setup.py test -q

README.rst

@@ -1,6 +1,10 @@
 mwparserfromhell
 ================
 
+.. image:: https://travis-ci.org/earwig/mwparserfromhell.png?branch=develop
+  :alt: Build Status
+  :target: http://travis-ci.org/earwig/mwparserfromhell
+
 **mwparserfromhell** (the *MediaWiki Parser from Hell*) is a Python package
 that provides an easy-to-use and outrageously powerful parser for MediaWiki_
 wikicode. It supports Python 2 and Python 3.