added new root.format
untrack .pyc files
undid pyc commits for merge with master
Merge branch 'master' into cb-ext
Merge branch 'cb' into cb-ext