apply updated form variables from thoughtbot/master