Bump to scala 2.11.2 & cleanup