Continued bugfixing
Merge branch 'titan09' of https://github.com/thinkaurelius/titan into titan09