Updated to scala version 2.11.2
Cleaned imports