replaced subjects with tags and general bug fix with relationships
Merge branch 'MarcJunk'

Conflicts:
	app/models.py

removed pipl and moved send_grid