Trivial fixes, and advise people to use the '-r' flag appropriately.
Merge branch 'master' of github.com:rcls/crap