Upgrading to hydra-head 6.4 and Rails 4
Merge branch 'hh-6.1' to update to hydra-head 6.4