added emily's search type drop style but commented out for now
Merge remote-tracking branch 'upstream/master'
added new menu but commented out
Merge pull request #114 from jpecht/master

new menu but commented out