Here's the changes from my weeks away from home

Signed-off-by: Travis Martin <travis.h.martin@gmail.com>