Fixed merging errors. Pulled wrong stuff
Changing NewsTicker Style and editing the old rakefile so we don't run it on accident