Merge branch 'master' of github.com:Kazade/delimit
Attempt to handle *args and **kwargs and also default arguments. Annoyingly the tokenizer gets stuck in an infinite loop on Ubuntu 12.04 :/