Pulled down update for bundles
added elixir plugin
vimrc updates
added bufexplorer plugin
fix conflicts