adding flux
Merge branch 'master' of github.com:flype/dotfiles

Conflicts:
	osx_install.sh