Starting on linux/mac install script
Merge branch 'master' of github.com:Wordseer/wordseer_flask into easy-install
Added corenlp to requirements, install.sh works
Helpful status messages on install
Updated readme directions.
Switched to curl, more systems have that
install.sh is executable
Merge branch 'master' of github.com:Wordseer/wordseer_flask into easy-install

Conflicts:
	README.md
Revert "Merge pull request #72 from Wordseer/HMJ-XML-Mapper"

This reverts commit 08b19f7261c81490ac49fbeaf8c3138110209545, reversing
changes made to a54cde56951b9dbd2378fd065cc7c356cfca206a.
Merge branch 'master' of github.com:Wordseer/wordseer_flask into easy-install

Conflicts:
	README.md
removed mention of requirements_win.txt, they do not exist
Merge pull request #88 from Wordseer/easy-install

Easy install
This branch got messed up, trying to add .travis.yml again...
Consolidated two lists of stopwords into config.py
Merge pull request #90 from Wordseer/travis

Set up Travis CI.
Merge in master
Merge pull request #91 from Wordseer/unified-stopwords

Consolidated two lists of stopwords into config.py
fixed gitignore conflict
Merge branch 'removing-readerwriter' into sentence_error_handling
Finished core features, wrote rudimentary test