Merge branch 'master' into python

Conflicts:
	script/update

diff --cc atom.gyp
Simple merge

diff --cc script/update
index 89ddc06,4688600..23f306e
--- 1/script/update
--- 2/script/update
+++ b/script/update
@@@ -4,11 -4,10 +4,11 @@@ set -
  
  cd "$(dirname "$0")/.."
  
 -./script/update-frameworks
 -./script/update-node v0.10.12
 +./script/update-frameworks.py
- ./script/update-node.py --version v0.10.9
++./script/update-node.py --version v0.10.12
  
 -gyp --depth . atom.gyp \
 +gyp -f ninja --depth . atom.gyp \
 +  -Icommon.gypi \
    -Ivendor/brightray/brightray.gypi \
    -Dtarget_arch=ia32 \
    -Dlibrary=static_library