Included aliases for vagrant and a json formatting function in vim
Added new aliases for merging/diff
Removed direct load of bash_completion and loading profile.d/* files direct