std layout
        local vimrc
Merge branch 'master' of github.com:twist/rc_lib

Conflicts:
	rc/i3/conkyrc