Changed default timeout to 30 seconds and added it to help output
Merge branch 'master' of github.com:kchr/knack