Add Pipe and Caret to Emacs OSX keyboard map.
Disable line-wrap for html-mode.
Add PHPUnit to bin/
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'