added atrics_software var
Merge branch 'master' of github.com:flopp/dotfiles

Conflicts:
	dot.extra.manakin