added G4 hook to increase the timeout for serial communication
Merge branch 'issue_658' of https://github.com/vishnubob/OctoPrint into vishnubob-issue_658

Conflicts:
	src/octoprint/util/comm.py
Some minor cleanup