Fix tab indentation
Use spaces for indents and add EOF newline
Add colordiff to packages installed
Merge pull request #109 from x-team/colordiff

Add colordiff and fix some whitespace issues