Merge pull request #1 from gladson/master

Update to bootstrap v2.0.4 + js from gladson
add thanks to gladson
updated settings.py to work for django 1.4.2
Merge pull request #2 from mschettler/master

Updated settings.py to support latest Django 1.4.2
update to bootstrap v2.3.1 + js