added vim changes from laptop branch
added imap tab back into vimrc
added wicd back into rc.lua
merged origin, should fix push non-ff errors