initial commit
clean up for merge
merge with cwvh
remove chris' filetype stuff
update stuff