branch colors for thinkpad, new aliases
prompt changes
merge from master
better bash_inc handling
merge from master
fixed drush prompt, making double line