Removing pyc files and a few updates.
Merging.