Resolve more conflicts

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
Merge branch 'master' into bmake-ports