Merge branch 'newcommandspec' of https://github.com/carsonmcdonald/CocoaPods into carsonmcdonald-newcommandspec

Conflicts:
	spec/spec_helper/user_interface.rb