Guard 2, fix specs

Changes required to support Guard 2.0. Add guard-compat so that specs will run.
Merge branch 'Ahalogy/guard-2'