Digital River Cygwin changes.
Merge branch 'master' of github.com:suthsc/dotfiles

* 'master' of github.com:suthsc/dotfiles:
  commented out grunt and NSGlobalDomain.
Adding the .extra file for the netbook.
Removing refrences to .bash_aliases which is redundant to .aliases
Adding a git_dirty_character function.
Adding the git_dirty_character function.
Merge branch 'master' of github.com:suthsc/dotfiles into netbook

* 'master' of github.com:suthsc/dotfiles:
  Adding the git_dirty_character function.

Conflicts:
	.bash_prompt
Merge branch 'netbook' of github.com:suthsc/dotfiles into netbook

* 'netbook' of github.com:suthsc/dotfiles:
  Adding the .extra file for the netbook.

Conflicts:
	.extra