Updated Gem File with less gems over scss gems
Run 'bundle update'
Merge branch 'clean'

Conflicts:
	Gemfile.lock
Get Gemfile from master
Merge branch 'clean-fix' into clean
Run 'bundle update'
Merge branch 'clean'