added search
removed errant copies
made style changes
made style changes
Merge branch 'master' of https://github.com/bhamburg/bh2014