Upgrade project to PyCharm 3.1.3
Fix template to address changes in new typogrify