Fix: sort by citation_part, not citation, when searching the tokens table.
Added three missing metadata fields to PROIEL XML v2 schema.
Handle sorting by location in token searches manually.

This overrides the sort fields passed to ransack when the user specifies
sorting by location. This is slightly tricky to get right since so many
levels of objects are involved, but overriding the sorts attribute of the
search object on the basis of the params hash appears to produce acceptable
results.
Fix: only access params[:q][:s] if params[:q] set.
Fix: use adapter mysql2 rather than mysql in database.yml.example.
Upgrade ruby-sfst to 0.4.2 for OS X Mavericks support.
Fix: ensure all setup instructions use bundle exec.
Merge branch 'rel-1.4.0-maintenance'