Merge branch 'hotfix-0.1.2' into staging
Merge branch 'release-0.2' into staging
nil citation field bug
Merge branch 'hotfix-0.2.1' into staging
empty search bug
sphinx deployment
Merge branch '915_search' into develop
put weight numbers in parens
sphinx: disable country attributes for now

(makes indexing super slow)
Merge branch '915_search' into develop
keep search term in search box
Merge branch '915_search' into develop
Merge branch 'release-0.3' into staging
migration errors

- change drop table to drop table if exists
- change order of last two migrations (error: weight column does not
exist)
Merge branch 'staging' into 915_search
install whenever
configure whenever
add whenever to deployment
Merge branch '915_search' into develop
increase max matches; word stemming