new git aliases
Merge branch 'master' of github.com:findango/dotfiles
Updated with SourceTree diff/merge settings
Added aliases for cd .. multiple levels
just rearrange order of things
just tidy up alignment
just comments
indenting options for html/js