fixed several failed specs
Merge branch 'master' of github.com:lighthouse-labs/selfstarter into feature/11-order-revenue-method

Conflicts:
	spec/models/order_spec.rb