Merge itemtypes into v0.2
Fix syntax error in item factory
Clean up whitespace in spec_helper.rb
Clean up whitespace in team_spec.rb
Pass ItemController tests, create item model spec
Remove team column from items