* 'master' of github.com:CocoaPods/CocoaPods:
  Don't print an error report when someone sends an interrupt signal.
  Add correct encoding comment to error_report.rb.

The command can picked a commit that was in a
branch and presented an overestimated number of new pods
as the branch may include the pods added to master
during its life time

The issues is recognizable by the following pattern
`$pod list 2' => shows 20 new pods
`$pod list 3' => shows a correct low number of new pods

I really love the online editing capability of GitHub, though!

Fixes https://github.com/CocoaPods/Specs/pull/84#commits-pushed-45cb459.

Colors

  - added colors
  - now the instructions appear after the teamplate
    and are visibile to the user as the last lines
  - fine tuned template

This reverts commit 674ce0c3.
See discussion for 8a3147 on github for details.

* master:
  Added note about set_arc_compatibility_flag to the CHANGELOG
  Looks like the -fobj-arc flag we added to OTHER_LD_FLAGS in ea918cd9 was an unsupported feature as it has now been removed from Xcode 4.3.2, causing lib tool to complain about an unrecognised flag.
  Instead of removing the VCR cache, namespace the cache by Ruby version.
  Remove Guard dependencies. Use `rake spec:kick` for auto-test-running.
  Make sure to use bundler for rake tasks that run bacon.
  Oops, use correct rake task.
  Move travis install commands to Rakefile and setup CFLAGS env for Travis/RVM.
  Hmm, chicken and egg problem on Travis, copy travis:setup task from Xcodeproj.
  Replace Xcodeproj git submodule by adding it to the Gemfile. Closes #172.
  Improve error report template. Closes #187.

Conflicts:
	.kick