Adding aaron part deux to notes.
Pulling down new stuff.

Merge branch 'master' of https://github.com/cugos/cugos.github.com
added a geo hipster, let's see if he breaks the site
Merge branch 'master' of https://github.com/cugos/cugos.github.com
people page: update location