updates
Merge branch 'master' of github.com:Nerubia/nerubia.github.com