Ignore pyc files
Get current branch working
Merge commit '2ff45bbb794baf244eb709477478c7cb06d8ed6b'