Merge branch 'master' into desktop-capture-api

diff --cc atom.gyp
Simple merge

diff --cc atom/browser/lib/init.coffee
Simple merge

diff --cc atom/common/node_bindings.cc
Simple merge

diff --cc docs/README.md
index cc25e9d,917f405..3a47eff
--- 1/docs/README.md
--- 2/docs/README.md
+++ b/docs/README.md
@@@ -46,10 -58,9 +58,10 @@@ select the tag that matches your versio
  
  ### Modules for the Renderer Process (Web Page):
  
- * [desktop-capturer](api/desktop-capturer.md)
- * [ipc (renderer)](api/ipc-renderer.md)
++* [desktopCapturer](api/desktop-capturer.md)
+ * [ipcRenderer](api/ipc-renderer.md)
  * [remote](api/remote.md)
- * [web-frame](api/web-frame.md)
+ * [webFrame](api/web-frame.md)
  
  ### Modules for Both Processes:
  

diff --cc filenames.gypi
index 46e06be,5e44ad7..aefe493
--- 1/filenames.gypi
--- 2/filenames.gypi
+++ b/filenames.gypi
@@@ -46,8 -53,9 +54,10 @@@
        'atom/renderer/lib/web-view/web-view.coffee',
        'atom/renderer/lib/web-view/web-view-attributes.coffee',
        'atom/renderer/lib/web-view/web-view-constants.coffee',
 +      'atom/renderer/api/lib/desktop-capturer.coffee',
+       'atom/renderer/api/lib/exports/electron.coffee',
        'atom/renderer/api/lib/ipc.coffee',
+       'atom/renderer/api/lib/ipc-renderer.coffee',
        'atom/renderer/api/lib/remote.coffee',
        'atom/renderer/api/lib/screen.coffee',
        'atom/renderer/api/lib/web-frame.coffee',