Convert remaining initializers to use instancetype
Merge pull request #2 from jordanekay/master

Convert remaining initializers to use instancetype