Travis workaround #1
Travis error fix #2
Merge branch 'master' of github.com:erikroyall/hilo

Merge HEAD with master