improved error messages, nil/not nil tests
Merge branch 'master' of github.com:anthonybishopric/gotcha