misc changes
Merge branch 'master' of github.com:chilicuil/chilicuil.github.com