Edit .travis.yml
Edit .travis.yml
Merge branch 'feature/20140304-travis' into develop