Merge branch 'new-apex-checkpoint'

Conflicts:
	lib/mavensmate-util.coffee
	lib/mavensmate.coffee
	menus/sidebar.cson