Cleaned up build and added scala 2.11.0- support