Merge pull request #14 from tzicatl/master

Update MX forms, address form for Colombia and fix postal_project to run with Django 1.6
Some ReStructured text reformat