Moved directory tests into separate modules.
some refactoring of test suite
in tests, load orgs by slug, not pk
Merge branch 'master' of github.com:toolness/hive-django

Conflicts:
	directory/tests/test_views.py