schema changes to MD file
Merge branch 'master' into Haney
Re-added EmailErrorAttribute, about to recode it
Merge pull request #4 from ironyx/master

Re-added EmailErrorAttribute, about to recode it