Please update your master branch

Since @aculich doesn't seem to have responded to your pull requests, I've been reduced to forking your repo and simply merging your branches on to its master. Please could you do this in your repo, thereby avoiding ever-increasing depth of forkage? I'd like to have your sensibly cleaned-up version in `el-get`.