Added comments for proposed changes in controllers
sync
Merge branch 'master' of https://github.com/Wordseer/wordseer_flask into HMJ-XML-Mapper
Merge pull request #88 from Wordseer/easy-install

Easy install
This branch got messed up, trying to add .travis.yml again...
Added support for data types, date formats and combined text
Merge origin/HMJ-XML-Mapper into HMJ-XML-Mapper
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
bug fixes. Will add documentation next
'sync'
Merged in tagger
Merge branch 'master' of github.com:Wordseer/wordseer_flask into reduce-db-queries

Conflicts:
	app/uploader/views/views.py
Merge pull request #100 from Wordseer/reduce-db-queries

Added comments for proposed changes in controllers
Easier, more foolproof way of separating the name of the downloaded file (works on macs better)