Merge branch 'initialize' of https://github.com/clnoll/rps into orm
Some messy ORM updates and specs
Merge branch 'orm' of https://github.com/clnoll/rps into initialize
saving all changes