removed collectionFS stuff, realized it is irrelevant
Merge branch 'master' of github.com:David-Durst/ptour