updated bootstrap
update diff alias to colordiff -u