Incorporated Bob Beattie's 4th axis changes with some minor modifications of my own to minimize the change set.
Merge branch 'master' into bobs-4th-axis

* master:
  Minor bug fix and CPU pin map update.
  Merge branch 'master' of https://github.com/grbl/grbl

Conflicts:
	config.h