Added git completion and merged aliases from master