Mucking with raketask
rake mods
Merge branch 'master' into gh-pages