expand
minor fixes
move waffle.io down
Merge pull request #18 from waldir/master

move stuff from master to gh-pages