add flay
More stuff

Conflicts:
	aliasrc
	vimrc