deprecated find_or_create_by_name to use new syntax
remove un-used methods
upgrade rails 4.0.1
wip
fix test
merging from upstream