Edited .vimrc
Merge branch 'master' into monoxide
Added .bash.d/ipmi
Merge branch 'master' into monoxide