Adding Screencaster backend
Fix merge conflicts
Merge pull request #36 from NerdYouDontKnow/master

Added icons to navbar
List pending/approved videos
Closing accounts now working
Merge branch 'master' of github.com:CodePilotCo/CMS
Merge branch 'master' of git://github.com/CodePilotCo/CMS
Added the user's name to navbar and log in/logout links
Merge pull request #40 from jamiehoyle/master

Added the user's name to navbar and log in/logout links
More things
Merge branch 'master' of github.com:CodePilotCo/CMS
User passed with every request
Undid the oopsie
List pending/approved videos
Merge branch 'master' of git://github.com/CodePilotCo/CMS
Changing roles now works
Merge branch 'master' of github.com:CodePilotCo/CMS
We fancy
Merge pull request #41 from DanielTomlinson/master

Add screencaster backend
Banished DS_STORE

Because 3DS_STORE is so much cooler