Console colors are now properly reset when exiting the REPL.
Fixed merge conflicts.
Merge pull request #261 from patriksvensson/dev

Console colors are now properly reset when exiting the REPL.
Merge remote-tracking branch 'upstream/dev' into 140