Update to 12-20-2014

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>