adding a new blog post with ideas for instructor training after being trained as a TA at UC Davis
Merge branch 'teaching_at_uc_davis' of github.com:abostroem/site into teaching_at_uc_davis
Minor edits
Merge branch 'master' of github.com:swcarpentry/site into teaching_at_uc_davis
Incorporating comments from Trevor and Greg

Clarified who was teaching the course and who was being taught
Merging Greg's PR into my updated version
spelling out numbers
Merge branch 'gvwilson-teaching_at_uc_davis' into teaching_at_uc_davis
Merging changes from @abostroem
Merge branch 'teaching_at_uc_davis'
Draft of post on metadata
Fix typo feedback from pull request
Present-time -> presentation-time
Fix github fake URLs to at least be sensible
Missing quote
Fix spelling
Update github URL
Changes and formatting from Greg after face-to-face chat (thanks!)
Added URL for 2014-12-03-edinburgh
2014-12-03-edinburgh announce post