CLUB-268 don't set a story as valid when it hasn't changed from the default text
Merge pull request #1197 from onepercentclub/feature/club-268

CLUB-268
add option to set the bluebottle package location when building css
Update .travis.yml

Conflicts:
	.travis.yml
	Gruntfile.js
Get bluebottle package path using pip show
Compile css for travis

Conflicts:
	.travis.yml
Update .travis.yml
Merge pull request #1206 from onepercentclub/feature/sass-travis

Feature/sass travis
mErge branch 'release/bb-development' of git://github.com/onepercentclub/onepercentclub-site into feature/fixed-styles
Fixed some IE bugs
Fixed several layout issues and IE bugs