changed markdown macros into mapped keys
deleted eclim
Merge branch 'master' of https://github.com/natemara/vimfiles

Conflicts:
	configs/macros.vim
	eclim/ftplugin/cpp.vim
	eclim/ftplugin/java.vim