The marathons model and migration, I'm still trying to figure out how to remove the original marathon migration, but right now it isn't affecting anything so no big deal
Merge branch 'master' into bandell-branch