Remove assembly stuff which doesn't matter to me
Update Scala to 2.11