Updated to install compass for travis-ci.
Merge branch 'master' into issue-482-convert-to-coffee-script

Conflicts:
	.travis.yml