Merge pull request #46 from pickle27/master

Ver2 of the Shogun Site
this got wonky in my rebase but we already ran it so it doens't matter
migration to fix path issue