updated the mappings to reflect the new schema coming off the wire

Signed-off-by: Jake Bromberg <jake.bromberg@gmail.com>
cleaned up a few lines

Signed-off-by: Jake Bromberg <jake.bromberg@gmail.com>
Merge branch 'master' of https://github.com/jakebromberg/wxyc-iphone-app

Signed-off-by: Jake Bromberg <jake.bromberg@gmail.com>

Conflicts:
	Classes/WXYCAppDelegate.m