merge upstream changes
Merge branch 'master' into improve-performance

Conflicts:
	puppet/manifests/vagrant.pp
move vagrant box os from lucid to precise
add rabbitmq to the vagrant setup
add celery, django-celery and flower
delay css parsing through celery
add rabbitmq settings to local.sample.py
update required libraries
update libraries in vendor
Merge pull request #60 from mozilla/update-libraries

Update libraries