Changed less alias to use -R (ANSI color codes) instead of -r (all control codes)
Merge branch 'release/2.0.2'
Merge branch 'master' of github.com:jmalloc/dotfiles

Conflicts:
	README.md
	lib/aliases.bash
Added vim bundle installation info to README.md