Adding back blog.pyc and comming.pyc as my local brach went out of sycn and was causing problems
Fixing conflicts
Fixed some errors that cropped up: