Rearranging things and introduced augroups
Still moving things around, added RSpecThis shortcut
Merge remote-tracking branch 'refs/remotes/origin/master'