update seeds data, remove class from shapeshifter css that was moved into hanuman for inheritance
pull in master branch and fix merge conflicts