Edit .travis.yml
Edit README.md
Merge branch 'feature/20140312-travis' into develop