add wrapping option in vim config, update go shortcuts, add bin aliaises for git
merge changes