Update Scala version and dependencies
Cleaned up and refactored demos
Merge branch 'demo-refresh'