merge laptop config with github, added vim-jinja