diff --git a/bash/.aliasrc b/bash/.aliasrc
index 9f7a6a1..3bc5ea8 100644
--- a/bash/.aliasrc
+++ b/bash/.aliasrc
@@ -2,16 +2,21 @@
 alias sa='source ~/.aliasrc'
 alias va='vim ~/.aliasrc'
 alias ga='alias | grep'
-alias la='less ~/.aliasrc'
+#alias la='less ~/.aliasrc'
+alias la='alias | less'
 alias gp='grep'
 
 alias prj='cd ~/dev/projects/'
 alias aws='"C:\dev\tools\AWSCLI\aws.exe"'
 
 alias cc='clear'
+alias ls='ls -GF'
 alias ll='ls -lah'
-alias lr='ls -larth'
+alias lr='ls -lahrt'
+alias lss='ls -lahrs'
+
 alias pwdd='pwd | sed 's:.*/::''
+alias di='diff -yw --suppress-common-lines'
 
 ### Git                        ######
 alias grso='git remote show origin'
@@ -46,6 +51,7 @@ alias gbD='git branch -d'
 
 alias s='gs'
 alias gs='git status'
+alias s='gs'
 alias gf='git fetch -t --prune'
 alias gd='git diff -w'
 alias gdc='git diff -w --cached'
diff --git a/bash/.bash_profile b/bash/.bash_profile
index 28ce567..3bbcd01 100644
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -1,2 +1,3 @@
+#!/bin/bash
 if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
 if [ -f ~/.aliasrc ]; then . ~/.aliasrc; fi
diff --git a/bash/.bashrc b/bash/.bashrc
index e565912..933cbdc 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -1,4 +1,5 @@
-test -f ~/.aliasrc && . $_
-test -f ~/.git-completion.bash && . $_
-test -f ~/.git-prompt.sh && . $_
-test -f ~/.ssh-agent-start.sh && . $_
+#!/bin/bash
+test -f ~/.aliasrc && . "$_"
+test -f ~/.git-completion.bash && . "$_"
+test -f ~/.git-prompt.sh && . "$_"
+test -f ~/.ssh-agent-start.sh && . "$_"
diff --git a/bash/.ssh-agent-start.sh b/bash/.ssh-agent-start.sh
index baacfda..4a89cbd 100644
--- a/bash/.ssh-agent-start.sh
+++ b/bash/.ssh-agent-start.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 env=~/.ssh/agent.env
 
 agent_load_env () { test -f "$env" && . "$env" >| /dev/null ; }
diff --git a/bash/.vimrc b/bash/.vimrc
new file mode 100644
index 0000000..90c79b3
--- /dev/null
+++ b/bash/.vimrc
@@ -0,0 +1,164 @@
+" URL: http://vim.wikia.com/wiki/Example_vimrc
+" Authors: http://vim.wikia.com/wiki/Vim_on_Freenode
+" Description: A minimal, but feature rich, example .vimrc. If you are a
+"              newbie, basing your first .vimrc on this file is a good choice.
+"              If you're a more advanced user, building your own .vimrc based
+"              on this file is still a good idea.
+
+"------------------------------------------------------------
+" Features {{{1
+"
+" These options and commands enable some very useful features in Vim, that
+" no user should have to live without.
+
+" Set 'nocompatible' to ward off unexpected things that your distro might
+" have made, as well as sanely reset options when re-sourcing .vimrc
+set nocompatible
+
+" Attempt to determine the type of a file based on its name and possibly its
+" contents. Use this to allow intelligent auto-indenting for each filetype,
+" and for plugins that are filetype specific.
+if has('filetype')
+  filetype indent plugin on
+endif
+
+" Enable syntax highlighting
+if has('syntax')
+  syntax on
+endif
+
+"------------------------------------------------------------
+" Must have options {{{1
+"
+" These are highly recommended options.
+
+" Vim with default settings does not allow easy switching between multiple files
+" in the same editor window. Users can use multiple split windows or multiple
+" tab pages to edit multiple files, but it is still best to enable an option to
+" allow easier switching between files.
+"
+" One such option is the 'hidden' option, which allows you to re-use the same
+" window and switch from an unsaved buffer without saving it first. Also allows
+" you to keep an undo history for multiple files when re-using the same window
+" in this way. Note that using persistent undo also lets you undo in multiple
+" files even in the same window, but is less efficient and is actually designed
+" for keeping undo history after closing Vim entirely. Vim will complain if you
+" try to quit without saving, and swap files will keep you safe if your computer
+" crashes.
+set hidden
+
+" Note that not everyone likes working this way (with the hidden option).
+" Alternatives include using tabs or split windows instead of re-using the same
+" window as mentioned above, and/or either of the following options:
+" set confirm
+" set autowriteall
+
+" Better command-line completion
+set wildmenu
+
+" Show partial commands in the last line of the screen
+set showcmd
+
+" Highlight searches (use <C-L> to temporarily turn off highlighting; see the
+" mapping of <C-L> below)
+set hlsearch
+
+" Modelines have historically been a source of security vulnerabilities. As
+" such, it may be a good idea to disable them and use the securemodelines
+" script, <http://www.vim.org/scripts/script.php?script_id=1876>.
+" set nomodeline
+
+
+"------------------------------------------------------------
+" Usability options {{{1
+"
+" These are options that users frequently set in their .vimrc. Some of them
+" change Vim's behaviour in ways which deviate from the true Vi way, but
+" which are considered to add usability. Which, if any, of these options to
+" use is very much a personal preference, but they are harmless.
+
+" Use case insensitive search, except when using capital letters
+set ignorecase
+set smartcase
+
+" Allow backspacing over autoindent, line breaks and start of insert action
+set backspace=indent,eol,start
+
+" When opening a new line and no filetype-specific indenting is enabled, keep
+" the same indent as the line you're currently on. Useful for READMEs, etc.
+set autoindent
+
+" Stop certain movements from always going to the first character of a line.
+" While this behaviour deviates from that of Vi, it does what most users
+" coming from other editors would expect.
+set nostartofline
+
+" Display the cursor position on the last line of the screen or in the status
+" line of a window
+set ruler
+
+" Always display the status line, even if only one window is displayed
+set laststatus=2
+
+" Instead of failing a command because of unsaved changes, instead raise a
+" dialogue asking if you wish to save changed files.
+set confirm
+
+" Use visual bell instead of beeping when doing something wrong
+set visualbell
+
+" And reset the terminal code for the visual bell. If visualbell is set, and
+" this line is also included, vim will neither flash nor beep. If visualbell
+" is unset, this does nothing.
+set t_vb=
+
+" Enable use of the mouse for all modes
+if has('mouse')
+  set mouse=a
+endif
+
+" Set the command window height to 2 lines, to avoid many cases of having to
+" "press <Enter> to continue"
+set cmdheight=2
+
+" Display line numbers on the left
+set number
+
+" Quickly time out on keycodes, but never time out on mappings
+set notimeout ttimeout ttimeoutlen=200
+
+" Use <F11> to toggle between 'paste' and 'nopaste'
+set pastetoggle=<F11>
+
+
+"------------------------------------------------------------
+" Indentation options {{{1
+"
+" Indentation settings according to personal preference.
+
+" Indentation settings for using 4 spaces instead of tabs.
+" Do not change 'tabstop' from its default value of 8 with this setup.
+set shiftwidth=4
+set softtabstop=4
+set expandtab
+
+" Indentation settings for using hard tabs for indent. Display tabs as
+" four characters wide.
+"set shiftwidth=4
+"set tabstop=4
+
+
+"------------------------------------------------------------
+" Mappings {{{1
+"
+" Useful mappings
+
+" Map Y to act like D and C, i.e. to yank until EOL, rather than act as yy,
+" which is the default
+map Y y$
+
+" Map <C-L> (redraw screen) to also turn off search highlighting until the
+" next search
+nnoremap <C-L> :nohl<CR><C-L>
+
+"------------------------------------------------------------
diff --git a/bash/README.md b/bash/README.md
index 285649a..fb74486 100644
--- a/bash/README.md
+++ b/bash/README.md
@@ -1,16 +1,16 @@
 # Bash command prompt settings
 
-Look at [.bash_profile](.bash_profile) -> [.bashrc](.bashrc) -> [.aliasrc](.aliasrc) to see the many shortcuts I use on a dailty basis
+Look at [.bash_profile](.bash_profile) -> [.bashrc](.bashrc) -> [.aliasrc](.aliasrc) to see the many short cuts I use on a daily basis.
 
 ## Install steps
 
 _These files are for use on Mac OS, and \*nix systems._
 
 Copy all the shell script files in this directory to your home directory: (e.g. `~/` or `/Users/barry`)
-- `.aliasrc`
-- `.bash*`
-- `*.sh`
-- `*.bash`
+ - `.aliasrc`
+ - `.bash*`
+ - `*.sh`
+ - `*.bash`
 
 ## Colour settings
 - Screen background
@@ -18,6 +18,6 @@ Copy all the shell script files in this directory to your home directory: (e.g.
   - G:0
   - B:80
 - Screen text
-   - R:187
-   - G:187
-   - B:0
+  - R:187
+  - G:187
+  - B:0
diff --git a/bash/git-completion.bash b/bash/git-completion.bash
index d934417..dffea2d 100644
--- a/bash/git-completion.bash
+++ b/bash/git-completion.bash
@@ -1,3 +1,4 @@
+#!/bin/bash
 # bash/zsh completion support for core Git.
 #
 # Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
diff --git a/bash/git-prompt.sh b/bash/git-prompt.sh
index c6cbef3..d846328 100644
--- a/bash/git-prompt.sh
+++ b/bash/git-prompt.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # bash/zsh git prompt support
 #
 # Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>