Merge branch 'release-2014-10-03'
Merge branch 'develop'
Merge branch 'release-2014-10-17' of github.com:AnnArborTees/softwear-crm into release-2014-10-31
Merge branch 'develop' into release-2014-10-31
Create simple_token_authentication.rb

THIS should make simple token authentication actually work from Spree, dang.
Merge branch 'release-2014-10-17' into release-2014-10-31

Conflicts:
	config/deploy.rb
story-212 Basic and sales information
story-212 Reorganized all but imprintable variant tables
story-212 Working through specs
story-212 Working through specs, fixed some bad specs
Merge branch 'story-212' into develop