Merge branch 'dev' into release-1.10.0
update bower
Merge branch 'release-1.10.0' into release-1.11.0

Conflicts:
	bower.json
Merge branch 'dev' into release-1.11.0

Conflicts:
	bower.json
Merge branch 'doc_cards' of github.com:meetup/sassquatch
Merge branch 'master' into doc_cards