Xcode 4.6 project upgrade
Merge pull request #41 from rowanj/xcode

Xcode 4.6 project upgrade
fix "No newline at end of file" warning
fix "No newline at end of file" warning
fix "No newline at end of file" warning
fix "No newline at end of file" warning
fix "No newline at end of file" warning
fix "No newline at end of file" warning
Merge pull request #42 from sspitzer/master

pull request to fix to minor warnings
Merge branch 'master' of https://github.com/specta/expecta

Conflicts:
	Expecta.xcodeproj/project.pbxproj