Merge branch 'release/1.1.0' into develop
Comment out crap that makes Travis freak out.
Merge branch 'develop'