allow comments in machines_enabled

courtesy of Andrew Hardie <hardieas@gmail.com>. Also clean up a couple
string bits