Pulled lastest master and merged my changes with it, including fleshing out of form styles