local commit

files uncommited on home machine
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/floras-nltk/floras_nltk.py