Squashed commit of the following:

commit 72083b1c9312032f32babea77c8a0cf63d01c36c
Author: Chris Abrams <mail@chrisabrams.com>
Date:   Thu May 15 11:08:03 2014 -0700

    update to latest browserify