Merge branches 'master' and 'timvalenta' of github.com:pivotal-energy-solutions/axis

Conflicts:
	lib/django-company-registration
Some clean up - and adding in my requirements..