update .gitignore
update for scala 2.10 and akka 2.1
Merge branch 'master' of https://github.com/codenamestif/scalashot