getting the ball rolling
Merge pull request #1 from GigaOM/master

sync with master
end comments
removing extraneous comment
consistent spacing
Merge pull request #13 from misterbisson/codesniffer

Code sniffer cleanup