Fixing Gem stuff
Merge branch 'master' of https://github.com/devoid/magellan_site