Re-Upload with Jason's recommendations

This contains the recommendations given by Jason for proper future
source control.