More verbose git output.
More colorful prompt.
Merge master.