Merge in the upstream changes

* This will require a migration to be run
Merge pull request #52 from kehh/updateUpstream20140604

Merge in the upstream changes