Added remove trailing whitespace for .vimrc

Created git pre-commit hook in PHP to check for a custom PS2 ruleset
resolved conflicts