scarab/ dir added to gitignore, just to keep it separate
Added .idea to .gitignore
Merge branch 'master' of github.com:blindstore/blindstore