Merge branch 'master' of github.com:arielspear/swap-tacular into ariel
Server now stores string for location that user provides.
Spelling fix
Merge fix.