Now using the grain 'server_id' as the mysql server_id

Also changed db_master role to db-master when determining whether
or not to turn on binary logging.