Some Merasmus fixes

-Added Merasmus to characters.cfg
-Formatting pass on merasmus.cfg
-Some changes that may or may not be correct.