Merge pull request #9 from red-admirals-2014/new_search

New search
controller test funtional, failing
functional passing controller test
Merge branch 'master' into new_search