Still attempting travis
Merge branch 'master' of https://github.com/alexsomeoddpilot/google-fastbutton

Conflicts:
	.travis.yml