staging
Squashed commit of the following:

commit 3c21ca38dbb32a8bfdec831a4d02994e6215bcf0
Author: Ubuntu <ubuntu@ip-172-31-40-20.us-west-2.compute.internal>
Date:   Sat Feb 1 20:42:06 2014 +0000

    develop