Some improvements

Hi,

so I've finally took the time to test this :)

We are going to use this as our default setup, and I'm also planning on merging it into the zidisha repo (so it is always up-to-date). I've made some adjustments (take a look at the commit messages for more info). If you have time, it would be great if you could take a quick look at this and see if you agree with the changes I've made.

Thanks so much!
Jonas