awesome 3.5 ?
awesome 3.5 branch?
can't into branches
Merge branch 'devel'

Conflicts:
	.vimrc
wait for it