update schema
Merge branch 'master' of https://github.com/atlrug-rhok/rhok-rails
Merge branch 'master' of https://github.com/atlrug-rhok/rhok-rails
Merge branch 'master' of https://github.com/atlrug-rhok/rhok-rails
Merge branch 'master' of https://github.com/atlrug-rhok/rhok-rails
Merge branch 'master' of https://github.com/atlrug-rhok/rhok-rails
Merge branch 'master' of https://github.com/atlrug-rhok/rhok-rails
Merge branch 'master' of https://github.com/atlrug-rhok/rhok-rails
Upgraded rails to 3.2.14.rc2
Updated Gemfile.lock file
Port order list view
initial rails 4.0.0 port changes
Merge branch 'rails4' into railsify
Use compass from a rails4 compat branch

... for now, at least.
Stop Travis' complaining about irrelevant branches
Merge branch 'rails4' into railsify
fixed rails4 branch for cucumber tests
fix .travis.yml file
Removed cucumber warning in railsify branch
WIP

So far this:
- Ports over the new order view
- Rearranges the order controller to approximately where it needs to be

Still need to wire up the bits to make creation actually work and then
port over the order fulfillment view.