Added a bunch of things to the model, including <=> methods for sorting app-side, some convenience methods, and made sure all the attributes and has_many's and etc were correct
Merge remote-tracking branch 'origin/master'