magit-tramp/org-magit:  Change upstream to magit.

Both packages seem to be now maintained by the magit team.
Merge pull request #1801 from ruediger/org-magit-tramp

magit-tramp/org-magit:  Change upstream to magit.
magit-filenotify: Depends on Magit
lua-mode: add ample-regexps dep, change type to github
Merge pull request #1802 from immerrr/update-lua-mode-recipe

lua-mode: add ample-regexps dep, change type to github
recipe: flycheck-haskell
recipe: flycheck-mercury
flycheck-hdevtools: Load after user loads Flycheck
recipe: flycheck-d-unittest
erc: Proper el-get recipe
recipe: erbot
recipe: erc nicklist icons directory
recipe: bitlbee
recipe: Use autoload for erc-highlight-nicknames
recipe: bbdb2erc
Add git-timemachine recipe
Merge pull request #1803 from pierre-lecocq/git-timemachine_recipe

Add git-timemachine recipe
recipe: go-eldoc has an autoload
recipe: Make go-oracle-mode autoload interactive
recipe: git-timemachine requires Emacs 24.4 (`subr-x')