optimizing json with oj
Fixed uploader
added tags to canonical list
updating canonical
adding flattener/rubocop changes
Added more facebook data
rubocop fix
Updating from master