Lots of updates.
Merge branch 'master' of https://github.com/charlespittman/dot_files