Merge pull request #7 from binaryberry/master

fixed merge conflict in spec helper
Merge pull request #8 from binaryberry/master

improved slider test
Refactored upload methods out of the controller and into the Event model
resolving rebase issues