added additional search options
Merge branch 'master' of github.com:railsrumble/r13-team-39