Adding dircolors plugin + adding /usr/local/lib to LD_LIBRARY_PATH
Adding ack-grep intelligent alias
Setting submodules to track master branch + updating submodules
Merge branch 'master' of github.com:minijackson/prezto

Conflicts:
	.gitmodules