Move to plain structure, add aliases
Merge branch 'plain-up'

Conflicts:
	.tmux.conf