Merge pull request #7 from voteblake/master

Resolve Secret Token Issues
travis keys cannot be from pull request
Merge branch 'master' of ssh://github.com/voteblake/farmbot-web-api

Conflicts:
	.travis.yml