comment out platform-specific gems
Merge branch 'master' into npomatters

:q
ignore application.yml variations
index template to NPOMatters
Merge branch 'master' into npomatters

:q
upgrade stuff