Adding web site generator script
Committing Daman's code changes and clean-up
Made some changes to the daemon for logging
Fixing the documentation that I changed
Changing the way the daemon logs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Documentation/Shuttle.docx