spaceless, markdown
Merge branch 'master' of github.com:jeffreyweston/smallpaper

Conflicts:
	smallpaper/templates/common/layouts/base.html