Update copyright notice
Add method for parsing syslog timestamps to struct_time
Merge branch 'collector'

Conflicts:
	netsyslog.py
Merge branch 'master' into debian