add hint to makefile
Add SuperTab & tweak vimrc settings
Resolve merge conflicts, and modify final message on make.hs