Fixed a few things
Fixed some things broken by a rebase
Also added a few things to gitignore