refactor to remove "with context" when importing macros
change for GCOD-306
Merge branch 'master' of git://github.com/open-data/ckanext-canada
changes for GCOD-340
fix for GCOD-329
add instructions to README for resolving GCOD-147
fix for GCOD-190
Merge pull request #246 from deniszgonjanin/master

fixes for outstanding issues