Remove obsolete keywords
Account for one-character function names
Option and Either are now capitalised
Update macro_rules snippet so that it defaults to one line
Remove obsolete colon from impl snippet
Merge pull request #9 from bjz/master

Various updates to keep up with changes to the language