Adding further enhancements.

Incorporating the changes from https://github.com/mathiasbynens/dotfiles