* 0.17:
  Added help display tests. added lint test for nonexistent specs. Removed cat tests in favor of which tests
  Removed Gemfile.lock
  GitIgnore Gemfile.lock
  Modified gitmodules to ignore the SSToolKit submodule when it's marked as dirty
  Fixed tests for which
  Adding which tests
  Edited editor behavior and errors
  Fixed no input
  Added pod spec which and edit, edited cat
  Updated example podspec comment

Conflicts:
	Gemfile.lock

Added help display tests. added lint test for nonexistent specs. Removed cat tests in favor of which tests

* master:
  Update README.md
  Release 0.16.1
  [Gemspec] Bump Xcodeproj to 0.4.1
  [CHANGELOG] Update for Xcodeproj 0.4.1 and CocoaPods 0.16.1
  Update bundle and make specs green.
  [Update Command] Remove duplicate option in help. Closes #725.
  Update previous patch to match code-style.
  Unpack tgz files into pod's root #727
  If a repo isn't passed to push default to master

Conflicts:
	CHANGELOG.md
	Gemfile.lock
	cocoapods.gemspec
	lib/cocoapods.rb
	lib/cocoapods/command/push.rb
	lib/cocoapods/command/update.rb
	lib/cocoapods/downloader/http.rb
	spec/functional/downloader_spec.rb
	spec/unit/http_spec.rb

Small README.md update

Fix twitter links to @CocoaPods account in description and Collaborate sections