Staged change
Merge branch 'Spray-Blog' of https://github.com/windweller/Spray-Blog into Spray-Blog

Conflicts:
	.travis.yml