merge conflict resolved
Merge branch '4axis' of github.com:ashelly/grbl into 4axis
Merge branch '4axis' of github.com:ashelly/grbl into 4axis
Changes for a default board, removing any keyme specific defines