Switched to py3.3 and docopt
Minor changes