initial commit
mac vim and ubuntu merge finish