cleaned code up a bit, use a coding style more in line with modern php projects
oops ide stuff
Correct indentation and brace style.
Merge branch 'CarwynNelson-master'