Merge pull request #12 from Berkeley169/master

Merge pull request #11 from Berkeley169/text
having factorygirl automagically create pciture_langs. reflecting these changes in the spec tests
tweeks the get_language method on picture and tweeks a method in the pictures controller
Merge branch 'text' of https://github.com/Berkeley169/fight_Impunity_Haiti into models
further improvements to Picture model and its specs
Merge branch 'text' of https://github.com/Berkeley169/fight_Impunity_Haiti into models
implements the binary model and binary_langs. Also creates a script for updating the db.
Merge pull request #16 from Berkeley169/binary

Binary
Figures out how to grey out the language box on the picture form. Not sure if this is how we want to do it in the long run but it will certainly work. Working on #4
Merge branch 'models' of https://github.com/Berkeley169/fight_Impunity_Haiti into models
added video to model and factory girl specs
added factory girl specs
Merge pull request #17 from Berkeley169/models

Models
adds tags and adds the relationships between them. Right now the tags just have the language but we will eventually add more functionality
makes all the migrations work so they actually support the has and belongs to many functionality, previously they were trivial
Merge pull request #18 from Berkeley169/models

Models
adds a very basic test to the tags
changes a small thing in the pictures model, just trying to make it so our code passes all the metrics
Merge branch 'master' of https://github.com/Berkeley169/fight_Impunity_Haiti into models
merging the latest video work in with th emodel