- Various refactorings and bugfixes;
- Added runCommandInTerminal method to deal with conflicts.