Merge pull request #24 from jpecht/master

changed display of fields depending on search type
Merge pull request #25 from jpecht/master

fixed bug where clicking search would refresh page
fixed panning issue
Merge branch 'master', remote branch 'origin'
Merge remote-tracking branch 'upstream/master'