Updated to sync new directories and new files.
Merge branch 'master' of github.com:apexskier/wombat