Merge branch 'master' of https://github.com/knode/node-meatspace

Author: Gergely Nemeth

.travis.yml

@@ -4,5 +4,5 @@ node_js:
 script: npm run-script deploy
 env:
   global:
-  - GH_REF: github.com/mikeal/node-meatspace.git
-  - secure: RsZYDm04omEFiyFgpa5wH2Dl+x+lKelG8xwl0AwrrztHoDTGyEoDhUxvJMQR5HluoYx2WIBQ4wUIcTV1Z7deg9e6V4pEZMQ4H+KGWgc9/YfkZxm1wTtcXLn6BJPcgdH2GJ72IG4EQHKZttV8AmD1rOBkPAGCnkcUR4hRHhBKiaA=
+  - GH_REF: github.com/knode/node-meatspace.git
+  - secure: RIbIq8hI153J5trRaogHPziSahL9xFM2Vg6Yf3pKGDy5hmHJ/hQjLqkcdqok1MxpmqNqacy6IpYqJukYY7wUmQ5TKhaBa8v9/sPQs9hgfrV6XejmczWnmQaG0KZ14hvegtxL/SJW48N88JcOh9LeLLLarpTgvEAc5ulZuplWG+M=

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/mikeal/node-meatspace.png)](https://travis-ci.org/mikeal/node-meatspace)
+[![Build Status](https://travis-ci.org/knode/node-meatspace.png)](https://travis-ci.org/knode/node-meatspace)
 
 Node.js Meatspace
 ==============
@@ -22,9 +22,12 @@ send a pull request.*
 ### January 2014
 * *Jan 21th* **Budapest, Hungary** [Nodebp Meetup](http://www.meetup.com/nodebp/events/156892152)
 * *Jan 20th* **London, United Kingdom** [London Node User Group](http://lanyrd.com/2014/lnug-january/)
+* *Jan 23rd* **Melbourne, Australia** [Melbourne Node.js meetup](http://www.meetup.com/MelbNodeJS/events/154220132/)
 * *Jan 25th* **Brescia, Italy** [nodejsconf.it](http://nodejsconf.it)
 * *Jan 25th* **London, United Kingdom** [NodeBots of London](http://www.meetup.com/NodeBots-of-London/events/160405872/)
+* *Jan 27th* **Richland, WA, USA** [Hapi 2.0 Event at &yet](https://tito.io/&yet/hapijs-20)
 * *Jan 29th* **Paris, France** [ParisJS](http://www.meetup.com/FranceJS/events/158150272/)
+* *Jan 30th* **Los Angeles, CA, USA** [JS.LA](http://js.la)
 
 
 ### February 2014

deploy-ghpages.sh

@@ -10,5 +10,5 @@ node build.js
   cp ../countryiso.js ./countryiso.js
   git add .
   git commit -m "Deployed to Github Pages"
-  git push --force --quiet "https://${GH_TOKEN}@${GH_REF}" master:gh-pages >/dev/null
+  git push --force --quiet "https://${GH_TOKEN}@${GH_REF}" master:gh-pages > /dev/null 2>&1
 )