added vim
remove conf.txt
Merge pull request #1 from amsheehan/alex

Alex