Merge branch 'hotfix_bzk_html_uploader'
Merge branch 'release-3.3'
Merge branch 'release-3.3'
Merge branch 'release-3.3'
Merge branch 'release-3.3'
Merge branch 'release-3.3'
ignore Vim cruft
make AMCAT pip-installable

* README updated to reflect this
* manage.py is now a package with an __main__ package, run with python -m
  (see README)
* setup.py is not installed along, so version info encoded in amcat._version
Merge branch 'release-3.3'
Merge branch 'release-3.3'
allow for post requests in aggregate
Merge pull request #84 from larsmans/pip-installable

make AMCAT pip-installable
Update README.md
Move to elasticsearch version 1.0

Some breaking changes were made to (ao) the count api and the way fields are returned.

It is probably wise to upgrade the elasticsearch-py client as well.

See:
http://www.elasticsearch.org/blog/1-0-0-released/
http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/breaking-changes.html
Merge branch 'release-3.3'
Removing scraper code from main repository (see issue #99)

I removed the amcat/scraping  and amcat/scripts/maintenance folders.

I've pulled code from the scraperform / scraper / controller into the upload
code, but that should really be cleaned up.

Some of the uploaders use the old document class, do they really need it?
add chardet to pip requirements
Cleanup
Remove lots of old views and templates
fix navigator test case