Atoll improvements
Merge branch 'master' of https://github.com/aquarion/dotfiles

Conflicts:
	gitconfig
	install.sh