Fixed associations.
Merge branch 'master' of https://github.com/bradeckert/edrum
Latest gemfile.