Edit package.json
Edit .travis.yml
Merge branch 'feature/20140224-travis' into develop