Added brew cask
Added merge and diff tool to .gitconfig
Added .gitignore
Tidy up
Added grunt and bower