Night 13OCT2014

Making sure I get a commit in before I screw it up.

Signed-off-by: Clay Levering <claylevering@gmail.com>