Merge branch 'master' into develop
Trying a new approach to run tests on Travis without breaking gemnasium
Merge branch 'develop' of github.com:diowa/twbs_sass_rails into develop
Fixed conflicts
Merge branch 'develop' into feature/sass

Conflicts:
	.gitignore
	Gemfile