lets try the new build environment
Merge branch 'patch-1' of https://github.com/joshk/keybar into joshk-patch-1

Conflicts:
	.travis.yml
Merge branch 'joshk-patch-1'

* joshk-patch-1:
  lets try the new build environment