Modded the gitignore in a vain attempt to get rid of the pyc files...again
Fix all the merge conflits!