taking out more merge stuff from main search
Merge branch 'master' of github.com:cblair/portal