iTerm colours, whitespace cleanup, etc