convert all hashes to 1.9+ syntax
Merge pull request #61 from education/refactor

Convert all hashes to 1.9+ syntax