Replace annotate rake tasks with ones that actually work.

See: https://github.com/ctran/annotate_models/issues/118
Remove gems that are no longer recommended
bundle update
Switch to master branch of sshkit for better error logging
Merge branch 'master' into rails-3-2

Conflicts:
	Gemfile
	Gemfile.lock