Most features working
updating before making riak branch
Merge branch 'mongo' of github.com:griffar2/DB3 into mongo