Back to Makerbots version
Port over new config values and start cleaning up