Merge branch 'master' into feature/tidy-templating
avoid pulling in translations
Merge branch 'feature/travis' of ssh://github.com/mk270/openspending into feature/travis
revert accidentally committed lang changes
add gitignore
Merge branch 'feature/gitignore' into feature/travis
Merge branch 'master' into feature/travis
Merge branch 'master' into feature/tidy-templating
Merge branch 'feature/travis' into testing
Merge branch 'feature/tidy-templating' into testing