This commit includes other miscellaneous cleanups... Signed-off-by: Robby Workman <rworkman@slackbuilds.org>