Merge branch 'master' of github.com:Kazade/delimit
Make things work a lot better, still doesn't look like the buffers are getting destroyed...