Updating to newest puppet config
Merge branch 'develop' of ssh://github.com/akvo/akvo-rsr into develop
Merge branch 'develop' of github.com:akvo/akvo-rsr into develop
[#263] Added cron config and scripts for updating home page data and blog feed.
[#263] Added missing server subdomain parameter for home page cron jobs.
[#139, #263] Added Apache config files for test servers.
Revised the subdomain routing and added bot denial config.
Merge branch 'feature/interim_home_page' of github.com:akvo/akvo-rsr into develop
Merge branch 'develop' of github.com:akvo/akvo-rsr into develop
[#279] Added static map images to media assets.
[#279] Commented out dynamic maps and pasted in static placeholder images.
[#279] Added CSS to centre static map images.
[#279] Removed stray trailing > from global project map template.
[#279] Added disclaimer to global maps explaining static image regression.
[#279] Styled disclaimer text.
Removed redundant partner_site_domain assignment from akvo.rsr.middleware since it can never be persisted.
Removes Footer Labs Link Closes #280
Merge branch 'develop' of github.com:akvo/akvo-rsr into develop
Merge branch 'develop' of ssh://github.com/akvo/akvo-rsr into develop
[#268] Add Piwik analytics

Add django-piwik to requirements

Add settings for Piwik

Add template tags in rsr/base.html and partner_sites/base.html for Piwik

Conflicts resolved in:
	scripts/deployment/pip/requirements/2_rsr.txt
[#268] Add Piwik template tags to widgets