added a bunch o plugins
added supertab
merge fix