remove '$' from fixture because YAML output changes between ruby 2.0 and 2.1
add badges
Merge branch 'development'