Change Travis CI build branch back to "master". Updated README.
Merge branch 'develop'

Conflicts:
	.travis.yml
	README.md
Updated README. Test "grunt build" to check Usemin set up and working as expected.