Merge pull request #28 from norfolkjs/master

Added Norfolk.js to the list
Add MountainWest JSConf to conferences
Merge pull request #29 from blowmage/master

Add MountainWest JSConf to conferences
added Nairobi JS to the map
Merge pull request #30 from TechyTimo/master

Added Nairobi JS to the map
updated to new domain
Merge pull request #32 from stanzheng/master

updated domain for norfolkjs
changing for nairobijs website
Merge pull request #33 from TechyTimo/master

Updating nairobijs website
resolve conflicts