Merge pull request #20 from Ecotrust/gh-pages

Fast Forward
address oakley's punchlist of items
Merge pull request #59 from lucasbalzer/gh-pages

address oakley's punchlist of items 2