remove pending
in progress
Merge pull request #3 from locomotivecms/working

Working
Merge branch 'master' into bare_repositories

Conflicts:
	spec/unit/mounting_point_spec.rb