Fixing an issue with targets where case sensitivity of email_address mattered. The case of the email should NOT matter. This affected the counts of targets as well as modification of targets where there were duplicate targets.

Conflicts:
	crits/core/class_mapper.py
Changing the printing of duplicate targets to json. Added a option to delete duplicate targets.
Fixing campaigns listing of targets and target counts.
Setting option to trigger to true when specified on the command line options.
Fix a potential problem with an editable field.

This is probably best described with an example.

Edit an event and give it a description with some HTML in it. I've been
using an img tag. When the data is submitted it is rendered in the page.
If the page is reloaded it is properly sanitized.

Fix this by returning the sanitized data from the editable call.

For testing I made an event, and gave it a description with img tags in
the event creation form. I then verified that the data is stored in the
database without the HTML entities (eg: <img src ...>). When going to
view the page the tags are converted to the HTML entities and nothing is
rendered in my browser. This is normal behavior and expected.

I then edited the description, and put the HTML back in and upon submission
it would be rendered in the browser. I then put my change in place and
repeated and nothing is rendered. Also, with my change the contents
of the string in the databse is not changed. This is important because some
fields are converted in STIX documents and having the HTML entities would
likely break things.
collectstatic.
Minor change in how a column is removed from a table.
Created an add all columns back in action
removed white space
Merge pull request #305 from dmbuchta/removing_column_bug_fix

Minor change in how a column is removed from a table.
Add 'ushlex' to the salt requirements for python, per 2014-10-30 change by dsnellgrove
Merge pull request #306 from ckane/master

Add 'ushlex' to the salt requirements for python, per 2014-10-30 change ...
Prevents resizing of the last column
Removed white space
Merge pull request #308 from dmbuchta/last_column_resizing

Last column resizing
Make the UI outrageous if DEBUG is set

This allows development environments (or misconfigured production
environments) to be very obvious to users
Merge branch 'master' into editable
Standardize indentation in login.html
Convert much of login page positioning to relative values

A little more flexible for screen sizes. Login box width is still
vexing.
Make TOTP login optional

Hide the TOTP web login form if TOTP web login is disabled