Strikethrough unused section

Conflicts:

	instructor-make/AutomationMakeScript.odt
removed make file which was commited accidentally with last cherry-pick
Merge branch '2013-06-southampton' of github.com:seumasmorrison/boot-camps into 2013-06-southampton