Turns out I have to store the lexer name now too
Storing the lexer now. Sure.
Merge branch 'master' into upstream

Conflicts:
	pasttle/server.py