Representation options for location
Merge branch 'master'

Conflicts:
	stanford_tools/stanford-ner-2014-01-04/temp.txt
	stanford_tools/stanford-postagger-2014-01-04/temp.txt
Lexicon tags
Gitignore
Merge conflict
Oh, god git wouldn't leave me alone!