org-mode: install to proper dir
calibre: upgrade to 1.5.0
linux-3.11: upgrade to 3.11.3
Merge branch 'master' into idrisfix