Code review

I didn't have James's stuff that allowed users to view their past orders in my most current version, so I rebased his pull request with our current version of master. 

All specs are passing with exception of certain feature specs.