Removed unused aliases and added better diffing support
Reconfigured colored prompt to include stash indicator