Fix function overriding
Merge branch 'master' of github.com:evanmiller/boss_db
Merge branch 'master' of git://github.com/evanmiller/boss_db into migrations