A few minor changes regarding OSX support
Remove poorly supported magithub package
Merge remote-tracking branch 'upstream/master'