Allow help to be shown with -h or --help flag
Merge branch 'master' of github.com:jackfranklin/pulldown