changing something back in the dashboard layout
fixing a bug in the tags controller
migrations created and tests written. 2/5 models working
ready to merge, just need some basic spec tests
merging models into master, all tests passing now
removing a lot of the pending tests and deleting some trivial tests
Merge branch 'master' into notes
fixing one test in the binaries controller and adding a few things to the video test
fixing a small bug in the text_langs