Merge pull request #1 from efullea/gh-pages

Joint proposal after editor's meeting in Madrid
Merge pull request #2 from efullea/gh-pages

Various updates
Merge pull request #22 from efullea/gh-pages

Fixing several issues identified in the Madrid meeting