Merge branch 'release-2.0.0alpha1' into develop
Add finish threshold option
Merge remote-tracking branch 'origin/develop'
moved -o from input to output argument group
scripts for training and segmenting with a trained model
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'master' into develop
fixed argument group for --output
option for output formatting
option for output formatting (fixed)
Change outputformat to be unicode (Python 2)
command line argument for construction separator in output file
Create new version of convenience scripts (morfessor-train, morfessor-segment)
Add --max-epochs option (useful for doing testing and reporting)
Merge branch 'develop' of https://trac.ics.hut.fi/git/morfessor into develop

Conflicts:
	morfessor.py
bug fix for corpus weight tuning
bug fix for corpus weight tuning
Revert commit to master branch
Bumped version to 2.0.0alpha2
Merge branch 'master' of https://trac.ics.hut.fi/git/morfessor