settings and boozit from virt
Merge branch 'master' of https://github.com/dcoombs2/boozit

Conflicts:
	boozit/urls.py
fixing urls?
Merge branch 'master' of https://github.com/dcoombs2/boozit
Merge branch 'master' of https://github.com/dcoombs2/boozit
Merge branch 'master' of https://github.com/dcoombs2/boozit
Merge branch 'master' of https://github.com/dcoombs2/boozit
Merge branch 'master' of https://github.com/dcoombs2/boozit
Merge branch 'master' of https://github.com/dcoombs2/boozit
updating settings for azure