Merge branch 'feature/phantom' into feature/sauce

Conflicts:
	test/index.html
Merge branch 'feature/gulp' into feature/sauce

Conflicts:
	package.json
prevent travis builds clobbering each other

open sauce allows 3 concurrent builds
Merge branch 'feature/sauce' into develop