Fixes #192; explicitly add pages context_processor to settings
resolve merge conflict from master
Merge pull request #196 from mozilla/upgrade-settings

Explicitly add Page context_processors