Merge pull request #38 from CarlFK/master

Number of fixes to the setup scripts.
Merge pull request #39 from CarlFK/master

Better Bootstrap
Merge pull request #40 from CarlFK/master

Merging.
Small message fix.
Fixing for the rename to be clearer.
Lots of hacks to pycon2internal to work with Zookeepr output.
Lots of hacks to pycon2internal to work with Zookeepr output.
First attempt at fixing for the Twitter OAuth debacle.
More twitter fallout fixes.
Merge pull request #45 from CarlFK/master

use older syntax for apt-add-repository
Small fix for gst-dvswitch to gst-plugins-dvswitch change.
Merge remote-tracking branch 'origin/master'
Adding githalytics tracking.
Fixing git url in conf/setup.sh
fixed bitbucket url format for django-switter which caused make to error
Install aptitude so that we can use it on a ubuntu-server install
update stale apt db (for fresh VMs)
Removed assert from config.py which was erroring if config.json did not match config.private.json
Removed leftover function used by an assert which was removed by commit 39fc0d4eb581c3d9e271c45e77738ede97a8fa8f
Added config.private.json.example which should act as a template for config.private.json