Expanded aliases for Vim, expanded curl helpers and aliases
resolved git merge conflicts