Updated settings to use environment variables for keys/pws.
Merge pull request #1 from wc351/development

Creating a pull
Merge remote-tracking branch 'origin/development' into basic_fb
Altered project

Created views for campus and buildings so templates can display data for each specific campus. Updated urls for the new views and templates. Updated links in base html for search and detail views for campuses.Altered string methods in models for displaying data. Started writing test for models and urls. Added missing lines for campus to the initial data fixture.  Added settings to git.
Merge remote-tracking branch 'upstream/development' into basic_fb

Conflicts:
	templates/base.html
	ungmap/settings.py
Merge pull request #17 from crlyli/development

Development