Sort into logical sections and clean up formatting
Make lots of formatting and organization improvements
Merge branch 'devel'

Conflicts:
	.tmux.conf
Fix powerline config and clean formatting
Merge branch 'devel' - Powerline statusline fixed and formatting cleaned
up