Conflicts:

	app/helpers/dashboard_helper.rb

from running after every other rake command.

Conflicts:
	app/helpers/dashboard_helper.rb

Show commits as 'Commit' instead of 'Grit::Commit'

Moved shoulda to the :test group in Gemfile.

Use secure.gravatar.com when running over SSL

from running after every other rake command.

Conflicts:
	app/views/layouts/project.html.haml
	app/views/projects/_form.html.haml

Conflicts:
	app/views/layouts/project.html.haml