Starting over with ghost
Merge branch 'master' of https://github.com/paulgrock/pg2014

Conflicts:
	.gitignore
	LICENSE
	README.md
	config.example.js
	config.js
	content/data/ghost-dev.db