Ensure build status images points at master
clean up extract_short_flag
clean up some logic in build_option