Converted location param to be an array (or string), instead of hash.  Renamed session var
Merge branch 'master' of https://github.com/nburwell/mobile-surf