Changed some ints to NSIntegers

...to get rid of Xcode warnings.
Changed some properties to NSInteger
Merge pull request #17 from rsmoz/master

Got rid of some Xcode warnings