tivac/tristis — pull request #11 by tivac (2013-11-22 23:05:58+00:00)
Title: Regaining sanity

Lots of changes, still not where I'd like but much cleaner.