initial commit
Added vim, conky and bin config files
Merge remote-tracking branch 'github/master'