Refactored order logic out of user model
Refactored calls to the Order model
Merge branch 'master' into order_logic
Merge pull request #39 from nastysloper/order_logic

Order logic