failed merge, have odd state
Revert "failed merge, have odd state"

This reverts commit ad24908399cd950cd03750aa56e7ef877cd95bcd.
Updating my repo
alertsbyexpiredrev removed
almost identical where clauses
minor changes made
Merge pull request #97 from kaustabh/master

alertsbyexpiredrev removed.
add check for value
support comments in a hacky way
Merge branch 'master' into integrate

Conflicts:
	server.py