using tox
make complatible with python3
Merge branch 'master' of github.com:stvs2fork/django-budget

Conflicts:
	.coveragerc
	Makefile