Merge pull request #33 from adamhaney/master

Upgrading to django 1.5
Removed django from requirements

This will be used in projects that already include django. Keeping the django requirement at a specific version is wrong and is hurting people.
Update circle.yml to install django 1.5
Updated sleepy version to 1.0.1
Merge pull request #34 from dustincannon/master

Updated sleepy version to 1.0.1
Merge pull request #35 from dustincannon/develop

Bring develop up to date with changes from master
Initial work on CORS support
Fixed pep8 errors and added some helpful comments
Use CORS prefix instead of XS

* Changed CORS settings variable name prefix from XS to CORS
* Removed refs to AttachedPaginationLinks decorator
Merge pull request #36 from dustincannon/feature/CORS-support

Feature/cors support
Bump version to 1.1

* Bumped sleepy version to 1.1
* Added Access-Control-Max-Age header to CORS responses. This facilitates
  client-side caching of preflight responses
Merge pull request #37 from dustincannon/develop

Bump version to 1.1
Merge pull request #38 from akimboio/develop

Add CORS support to sleepy
Added 'Access-Control-Allow-Credentials' header to CORS responses

* Added 'Access-Control-Allow-Credentials' header to CORS responses
* Bumped version to 1.1.1
There's far too much 'woo' here.
Merge pull request #39 from dustincannon/develop

Added 'Access-Control-Allow-Credentials' header to CORS responses
Merge pull request #40 from akimboio/develop

Added 'Access-Control-Allow-Credentials' header to CORS responses
Merge branch 'master' of https://github.com/akimboio/sleepy

Conflicts:
	VERSIONS