Squashed commit of the following:

commit 6ea9bccdbbccaaba2acf439550a13a17c3923662
Author: Aric Lasry <lasry.aric@gmail.com>
Date:   Tue Aug 19 10:56:14 2014 -0700

    Working on the vad release