branched, and updated rc.lua to open nm-applet
Merged master into laptop
Merge branch 'master' into laptop
Merge branch 'master' into laptop
Merge branch 'master' into laptop
Merge branch 'master' into laptop
Merge branch 'master' into laptop
vim shortcuts to go to the start of the line
Merge branch 'master' into laptop
updated sakura prefs
Merge branch 'master' into laptop
Merge branch 'master' into laptop
Merge branch 'master' into laptop
swapped nm-applet for wicd-client
added vim changes from laptop branch
added imap tab back into vimrc
merged origin, should fix push non-ff errors