Pushing smells through the intertubes
long -> lon
Merge branch 'master' of github.com:AthensWorks/smap-ios

huh
Conflict madness