Switch recommendation from cancan to pundit
No longer recommend compass
Add "annotate" gem.
Merge branch 'master' into rails-3-2

Conflicts:
	Gemfile
	Gemfile.lock