MERGE Conflict resolution
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration

Conflicts:
	Quasar/main.js
QUASAR:  Allow running autoconfig on the default haystack configuration
QUASAR: Don't prevent deletion of the 'default' haystack configuration
QUASAR: Remove the debug 'checked' column from the training data page
QUASAR: static protocol header for SMTP
 
Proto header for SMTP is shown as prepended element on basic options
page

Completing issue #767
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration
MULT: Multiline recipients field in basic options

It'll need some testing from, well, not me, but it seems to work from a 
cursory using of it. 

fixed #766
Update gitignore for Ceres stuff
Merge branch 'integration' into ceres

Conflicts:
	.gitignore
CONFIG: Remove debug print
Create a "script generated alert" CE to capture bad service logins as hostile
NOVAD: Put more details in the "classification notes" string for each CE
LIB: Transitioning SMTP to new structure

Because we essentially have two Logger instances going (one in novad and
one in quasar), trying to reconcile a single log file for sending on a timer
becomes a bit of a problem. So, instead of having two different attachment
files (one for novad, one for quasar), going to make a daemon that handles
the email stuff, and is started or stopped based on the value of 
EMAIL_ALERTS_ENABLED (or whatever the config var is for that)
Merge branch 'scriptAlerts' into integration
BUILD: Rename 'default' haystack to 'sample'

Ticket #769
QUASAR: Show suspect optionsboth right and left clic, move buttons down
SMTP: have a daemon script to update the attachment, script to send

Just need to get these bad boys integrated into cron and the Logger 
stuff and SMTP should be a world better.
NOVAD: Fix encoding bug, python's argv not in unicode but sqlite expecting it
QUASAR: Fix bug with profile name validation

Ticket #775