Merge micolous

Just some changes of things. I can reverse the indentation changes in regexbot, just something bad happened, and I had to re-indent it all.