added some fancy git aliases and tweeked a few other thinks (not really sure what they where)