Code cleanup
Merge branch 'master' of https://github.com/mushkevych/configurations

Conflicts:
	CDH4.pseudo-distributed/etc/environment