Made some changes so as to not break melamid

Misc: added things to .gitignore, stuff I forgot to check in, stuff that
is half-implemented but can't be finished because @thisisdhaas wants
these changes.