post-merge cleanup
Merge pull request #66 from mergeconflict/mergeconflict/scala-bikeshedding

post-merge cleanup