- Cleanup for Flake
Merge branch 'master' of https://github.com/odoo-colombia/odoo-colombia
- Cleanup for Flake 2
- changed "ovverride 'city' column" to "add 'city_id column" for compatbibility reasons (travis test fails at loading test data)
Merge pull request #11 from odoo-colombia/master

Merge cleanup changes