Editing documentation
Merge branch 'titan05' of github.com:thinkaurelius/titan into titan05