Updating things, removing collections
Merge branch 'master' of git://github.com/NatElkins/iHava