merge
Merge branch 'master' of github.com:SteveMcArthur/steve.docpad

Conflicts:
	Steves.v11.suo