Nate's rake file push - master pull
fixed merge 'conflict'