Added Django Debug toolbar
merging now sets a revision comment