Merge pull request #1 from m-allanson/upstream

Typo in comments of .bashrc
Updating dotfiles for 2014
Fixing conflict
File permissions
Adding docker export, tweaking Git aliases
Tweaking bash prompt
Tweaking bash prompt
Adding Git alias
Removing notifications centre disable