PyParsing fails to install if 2.0.0 is installed

Python3 nonlocal statement in the setup.py in PyParsing
Merge pull request #214 from mcfletch/patch-1

PyParsing fails to install if 2.0.0 is installed
change display of the year variable according to django 1.5
implement prev/next year in entry_archive_year view
remove Vim swap files, thanks to minusf, close #216
refactor the translation of the URLs + tests
refactor zinnia_statistics for better code flow and coverage
remove useless fix for the time-zones in archive views, since we use Django 1.5
remove TemplateMimeTypeView mixin since TemplateView handle the content_type in paramaters
use update_fields argument when updating the denormalization of the discussions
Update feed2zinnia.py

typo line 95
adding line in install process to specify that we are working in an existing django project
better alert-box
use previous version of nose-progressive and start using pdbpp
Fix typo in entry_archive_day.html, thanks to amyfu, close #225
use the 1.4.1 version of nose-progressive, and Django 1.5.1
rename get_base_model to get_entry_base_model, it's more explicit
fix inheritence of the Author class for custom User model, close #215 #217
better regexp for capturing the week parameter
implement previous et next week link provided by the generic view