put label before main search field
made tests work with newer version of devise
Merge pull request #642 from bmaddy/main-search

put label before main search field