Added configuration for apache, bash, git, and vim.
Merge branch 'master' into dev

Conflicts:
	.gitmodules
	lib/installer.rb
Added missing default git aliases.