some changes
added some awesome bindings and a neat macro for converting shoulds to expects
Merge branch 'master' of github.com:kcurtin/dotfiles