added vim-fireplace
fixed merge conflicts