Basic integration of blog and Django CMS working.
Integrated GeoIP map.
Merge remote-tracking branch 'upstream/master'
Downloading database for new blog
New approach to including local settings in settings.py

This new function for including local settings is derived from the
one that Ben Cipollini implemented on the KA Lite website.
Set up GeoIP for map to work with local settings during development

Now the view for the map references a variable from settings.py instead
of being hard coded, allowing for the possibility of setting a different
location for the GeoIPCity.dat database file for development environments.
500.html template and base.html fix

Added a 500.html template and deleted an unnecessary comment in base.html
Added local_settings.py to .gitignore
Added info windows to map which display when markers are clicked

Now, when a marker on the map is clicked, an info window pops up
to inform the user where that marker is. City, region, and country name
will be listed, unless we are missing any of these fields in which case
the fields that we do have will be displayed (only region and country if no city
 or only country region and city are both missing).
Added donate button and link to map on fle landing page