Linux implementation of platform dependent uptime
Merge branch 'master' of github.com:yan12125/dotfiles

Conflicts:
	toplevel/vim