merging
added more shell aliases
added more features to vim
redo vim mappings to noremap