PSR2 related stuff with some minor bug fixes.

captcha needs to be rewritten from ground up.
mail class needs to be removed and added as a library.

Captcha and phpmailer due for changes so no more PSR2 related work.
Removed reference to class not yet added to commit.
Add some data locations to ignore

Should make it easier to sort out the real changes if your working copy is
also part of a live web site.