Cleanup and project files
Merge branch 'master' of https://github.com/charlesvestal/rational-exchange

Conflicts:
	Rational Exchange/Rational Exchange.xcodeproj/project.pbxproj