Fix typo in avrdude and atmega class names
Remove left over line from merge conflict
Merge pull request #9 from kakaroto/master

Misc fixes