Modify how the README is generated to make it tidier and so the correct README displays on github for puppet-blank
Merge branch 'master' into vagrant

Conflicts:
	README.markdown
	cleanup.ps1
	puppet-blank.README.1st.markdown