tested 4.0 good.
Tried to clean up a bit of the code sniffer problems
Fixed some of the codesniffer lines
Merge pull request #15 from kgneil/codesniffer

Tried to clean up a bit of the code sniffer problems
Merge pull request #1 from GigaOM/master

sync with master