Merge pull request #26 from vivekmshah/vivek

google maps js code cleanup
remove pesky orig files from mergetool
refactor results controller for conditional sql querying