Merge pull request #16 from lilfade/dev

Dev
Minor fixes

Email update working now, also fixed rule to prevent disabling master
account.  Removed some extraneous css/js files.
Merge pull request #17 from alexweissman/master

Minor fixes
just edited a few things but the form wont post to the page it needs to just simply reloads the window and i have no idea why. commiting to keep up to date