Merge branch 'master' of github.com:mike182uk/dotfiles
remove merge defaults
add hiphop stuff