Update merge procedure

Based on current state of discussion in #1
Merge branch 'refs/heads/gh-pages' into merge-procedure
Merge pull request #40 from openpolitics/merge-procedure

Update merge procedure