Somehow  the merge screwed up the install script, re-commiting.