getting feature and master caught up

Signed-off-by: Ryan Luton <ryan@lutonmedia.com>