Toxaris/pts — pull request #60 by Toxaris (2013-04-29 09:10:15+00:00)
Title: Merge topic/reorganization.

This is a heads up: I want to merge the branch topic/reorganization into master, and that will touch almost every file.