refactor rakefile (a little) and holiday hangover