Merge pull request #41 from jennielouie/working

fixed hunt.js.coffee code re-org
minor changes to hunt.js, location.js