Incorporate latest docopt, hopeful fix for g++ compilation