lots of stuff

yep
Goodnight Commit

argh
Merge branch 'master' of https://github.com/rajatb/wellDoneiOS into TylerMarioBranch
merge and fixes on map offset and autolayout
Merge branch 'master' of https://github.com/rajatb/wellDoneiOS into TylerMarioBranch

Conflicts:
	WellDoneiOS/NextPumpMapViewController.xib
Merge pull request #43 from rajatb/TylerMarioBranch

Tyler mario branch