Merge pull request #10 from lilfade/butterflyknife

Butterflyknife
Merge pull request #12 from lilfade/butterflyknife

Butterflyknife
Merge pull request #14 from alexweissman/butterflyknife

Butterflyknife
Added email login which is settable by the administrator via the site_settings.php page, will ask for username on the login.php page if the email_login field = 0 or else it will ask for Username or Email for login with checks to see if the username or email exists.
Merge pull request #15 from lilfade/butterflyknife

Butterflyknife
Changes to add validator class to posted vars
Merge pull request #16 from lilfade/butterflyknife

added validation class to posted vars
Merge pull request #48 from lilfade/master

Email login