commit change
add cancelled field
change deschedule
change flushqueue filter
Add tests
set default for cancelled
add package to setup.py
commit change
add cancelled field
change deschedule
change flushqueue filter
Add tests
set default for cancelled
add package to setup.py
Resolve conflict merge to develop
Make remove old job also remove cancelled job.
Add test for remove cancelled job.
Update changelog and setup.py
Merge branch 'develop' of https://github.com/KayEss/django-async into develop

Conflicts:
	ChangeLog
	async/management/commands/flush_queue.py
	setup.py
Merge branch 'develop' of https://github.com/KayEss/django-async into develop

Conflicts:
	ChangeLog
	async/api.py
	async/tests/test_api.py
	setup.py
Merge pull request #10 from DjNero/develop

Add field cancelled to async_job table