Update documentation for proposed option.
Add 'conflicted' status to file and properties.
Check for conflicts after a merge, and implement auto merge commit message.
Merge branch 'auto-merge' into develop.
Fix invalid state: 'normal' error, and make it clearer what state is invalid.
Change the order in which paths are detected / used. Previously, --pop wouldn't work when an upstream was set.
Add a getter for the 'tree-conflicted' state.
Check for tree conflicts as well as file state and property state.
Whitespace cleanup.
Highlight the current branch when listing upstreams.
Fix for filename case.
Add a class for using ANSI color codes.
Highlight the current branch, and use ANSI colors on non-Windows systems.
Re-index the array when removing items, else you get "holes" in the stack.
Merge branch 'develop'.

Bugs squashed:

* Fix bug where attempting to use 'switch --pop' would not use the branch stack when an upstream was set.
* Fix bug where removing an item from the middle of the branch stack would leave the ids non-sequential.

New Features:

* Add --auto option to merge, automatically commits with a meaningful message if merging succeeds with no conflicts.
* Detect tree conflicts as well as file and property ones.
* Highlight (using an asterisk and ANSI colours where available) the current branch when listing upstreams.
* Fix for case-sensitive filesystems.