Remove unused imports
Synchronize updates to GUI pieces (fixes ConcurrentModificationExceptions)
Merge branch 'master' of github.com:katherineng/terrace