update php-mode config, add .sjs to js-mode
Merge branch 'master' of github.com:michaelkitson/dotfiles