Hopefully this works
Merge branch 'gh-pages' of https://github.com/Magmoz/galaxy into gh-pages