Added nocolor and -e
Merge branch 'develop' of https://github.com/neontribe/DrupalMake into develop