Merge branch 'get_master_revision' into grrr

Conflicts:
	lib/ember-dev/git_support.rb
	spec/unit/git_support_spec.rb