Merge branch 'MarcJunk'

Conflicts:
	app/models.py

removed pipl and moved send_grid
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models.py
added unique