Add guitar sample, simplify adding samples, remove old patches and whitespace