Fixed filter junction
Merge remote-tracking branch 'origin/argus'
Fix for strptime format
adding documentation for skip_time
adding documentation for skip_time
adding documentation for skip_time
Wrapped Popen call in try:except block to prevent database corruption when binary not found; can happen when called from cron/shell script without proper path
Merge remote-tracking branch 'origin/argus' into argus

Conflicts:
	examples/argus.ini