Nate's rake file push - master pull
WIP
Refactored code
wip
wip
commented out eventbrite rake
fixed merge 'conflict'
Step. changes
fixed merge 'conflict'