changed git ignore rules for css folder
updated generated css behavior
Merge branch 'master' of github.com:rbsdev/pusher

Conflicts:
	gruntfile.js