Initial commit
Initial commit
Make build for production

Generated by Camo
Merge branch 'master' of git.pagodabox.com:mattaebersold into deploying-production

Conflicts:
	Gemfile
	Gemfile.lock
	Gruntfile.js
	app/config/app.php
	app/config/packages/bkwld/decoy/elements.yaml
	app/config/packages/bkwld/decoy/site.php
	app/config/site.php
	app/routes.php
	app/sass/_typography.scss
	app/sass/_variables.scss
	app/sass/admin/style.scss
	app/sass/style.scss
	app/views/layouts/_header.php
	app/views/layouts/default.php
	composer.json
	composer.lock
	composer.phar
	public/css/error.css
	public/dist/mapping.json