Merge pull request #6 from AppScale/master

Merge from main
Merge branch 'testing' of github.com:AppScale/appscale
Merge branch 'master' of github.com:nlake44/appscale
Merge branch 'testing' of github.com:AppScale/appscale
Merge branch 'testing' of github.com:AppScale/appscale into trans-tq
fixed fake objects
Merge branch 'trans-tq' of github.com:nlake44/appscale into trans-tq
Merge branch 'testing' of github.com:AppScale/appscale into trans-tq
fixes for transactional task in python
fix for entities which had a rollback on their first put
Fix where we remove 0 id rollbacked items
fixed tq test
code review fixes
Merge branch 'testing' of github.com:AppScale/appscale into trans-tq
Merge pull request #388 from nlake44/trans-tq

Transactional task implementation for python and fixes to rollback