starting new credit card api
getting ready for credit cards, cause theyll work off of a different server
Merge branch 'master' of https://github.com/mysterioustrousers/FirehoseCocoa

fixing merge conflicts after I made major formatting changes

Conflicts:
	FirehoseCocoa/FHAgentInvite.m
	FirehoseCocoa/FHFacebookPage.m
Merge branch 'master' of https://github.com/mysterioustrousers/FirehoseCocoa
upating project settings and making sure all tests pass