Copyright 2011–2013
Merge pull request #1 from royratcliffe/master

Fix for RFC-2822 test
Merge branch 'master' into issues/separate-framework-and-lib

* master:
  Copyright 2011–2013

Conflicts:
	ActiveSupportKit/ActiveSupportKit-Info.plist