Remove conflictual alias on Ubuntu
Merge branch 'master' of git://github.com/mcourtois/bash-config

Conflicts:
	aliases.d/defaults
New default aliases for puppet
Make puppet-clean a function

Making it a function is more easy on the eye and help to understand what
it does.
Merge pull request #6 from slamont/master

New puppet aliases default