Merge pull request #9 from smw1218/master

Tons of cleanup and added syslog formatter