added composer shortcuts
Merge remote-tracking branch 'origin/master'

Conflicts:
	puppet/scripts/custom_bash.sh
edit bash aliases
edit custom bash aliasess