Replace ctrlp with unite
Buffer navigation remaps
Remove seconds display from uptime
Remove /share/python from path
Merge branch 'master' into work-mac

Conflicts:
	.gitmodules