Merge remote-tracking branch 'brentgreeff/master' into development

Conflicts:
	annotate.gemspec
	lib/annotate.rb
	lib/annotate/annotate_models.rb
	lib/tasks/annotate_models.rake
	lib/tasks/annotate_routes.rake