Preparing Faunus for old Titan import
Merge branch 'faunus05' of https://github.com/thinkaurelius/faunus into faunus05