make `_add_uncommited_changed..` more versatile
Add new test `get_ahead_commits`
Handle merge conflicts in _resolve_merge_cnflicts() not in cherry-pick
blacklist /tmp/wordpress from coverage report
make _add_uncommited_changes_.. more versatile
optimized test_get_ahead_commits & test_get_behind_commits
Merge branch 'master' of github.com:PressLabs/gitium

Conflicts:
	phpunit.xml
Merge branch 'master' of github.com:PressLabs/gitium