files are no longer hidden
added vim split mappings
fixed merge conflict