Merge pull request #36 from wshafer/master

WEBCMS-113 - Fixed code for code sniffs and minor bugfixes.
Merge pull request #38 from wshafer/master

Fix Git ignore
Merge remote-tracking branch 'upstream/master'
Push for Rod to see the Repo