Merge pull request #1 from Siesna/master

Pulling in layout changes
cleaning up merge
removing ckeditor, cleaning up database and deploy
cleaning up migrations
installing import_products and delayed_job
adding foreman and bluepill for deployment
changing deployment scripts
updating spree initializer
removing product imports and delayed jobs for now
adjusting configuration and adding translations
incorporating design
adding spree product images, changing deploy script
adjusting deployment
fixing en.yml
static_pages issue
updating styles
issues with shipments
adjusting Gemfile
multistage/server deployment
Merge pull request #2 from Siesna/master

Fixing item page description bug