Fixes

Fix implemented for issue #41 in commit 685da0025988100ea2414ea628ac951b0be4a31e

Also changed some configuration stuff to avoid having config files tracked by git f7e04b3674f6f4328270da991a911265984fc072

I forgot to mention it in the commit, but it's a problem that may as well silently disappear