removed unused sign_up partial
Fixed a merge conflict on our front page