mods to miguno's work
add new Stashy Avro Scheme
fix merge conflict in gitignore