local commit

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

Conflicts:
	src/floras-nltk/floras_nltk.py
pycharming
Sunday
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/encodings.xml
	.idea/misc.xml
	.idea/taxonparser.iml
	.idea/vcs.xml
	.idea/workspace.xml
	.pydevproject
	src/floras-nltk/Snobol/__pycache__/Snobol.cpython-33.pyc
	src/floras-nltk/Snobol/__pycache__/__init__.cpython-33.pyc
	src/floras-nltk/floracorpus/ADO.py
	src/floras-nltk/floraparser/__pycache__/__init__.cpython-33.pyc
	src/floras-nltk/floraparser/__pycache__/bits.cpython-33.pyc
	src/floras-nltk/floraparser/__pycache__/glossaryreader.cpython-33.pyc
	src/floras-nltk/floraparser/__pycache__/pos.cpython-33.pyc
	src/floras-nltk/floraparser/__pycache__/splitter.cpython-33.pyc
	src/floras-nltk/floras_nltk.py
	src/floras-nltk/link_grammar/__pycache__/__init__.cpython-33.pyc
	src/floras-nltk/link_grammar/__pycache__/linkgrammar.cpython-33.pyc
	src/floras-nltk/link_grammar/link-grammar.dll
	src/floras-nltk/link_grammar/linkgrammar.py
	src/floras-nltk/notingloss.txt
Merge branch 'master' of https://github.com/ggosline/taxonparser
Adding botanical terms