p4.el is now available from melpa, so pull that.

Also forces M-x align and M-x align-regexp to use spaces instead of tabs.