Update order fulfillment page
Tidy formatting
Update user -> order association
Remove extra line
Merge master into user
Merge branch 'master' of https://github.com/kemccabe/betsy_rails