Merge branch 'master' of https://github.com/ethanmsmith/conquest

Conflicts:

project/target/config-classes/$9c95022f52f2af8216a8$$anonfun$$sbtdef$1.c
lass
Merge branch 'master' of https://github.com/ethanmsmith/conquest
Updating Actor