Merge branch 'master' of github.com:jbmoelker/pinata

Conflicts:
	.gitignore
	composer.json
	composer.lock
	config/production.php