Add compatibility with scala 2.10
Pulverize macro deprecation warnings between 2.10 and 2.11