Attempting good to go Solr config
Solr config situated.
Merge branch 'release-2014-10-17' into develop

Conflicts:
	config/deploy.rb
Merge branch 'develop'
Forgot to add these!
Simple Token Authentication Initializer
Fixed stupid bug with api sizes and imprintables
Merge branch 'release-2014-10-17' of https://github.com/AnnArborTees/softwear-crm into release-2014-10-17
Add base_upcharge to permitted params DAMN
Update imprintables_controller.rb
Fixed index query issue
I really gotta step up my game here
Merge branch 'release-2014-10-17'
Merge branch 'master' of github.com:AnnArborTees/softwear-crm