New showmarks
Revert "Add autocomplpop"

This reverts commit c9c94dc4060747dff3a103778f78fec39a8aeb05.

Conflicts:
	.vimrc
Remove bundles from tracking
Edit options
Add airline
Sort bundles
Configure airline
Configure color schemes