Using ProxyView CBV
Updating django to 1.6b4
Small html fixes
Adding Diazo to requirements.txt
Fixing proxyview attr names
Merge branch 'bootstrap' of github.com:TracyWebTech/colab into bootstrap