Allow custom error class name for Abide
Resolve merge conflicts
Merge branch 'master' of https://github.com/zurb/foundation