added matches ng-controller, index and show pages
changed hero routes to use jbuilder url, removed extra code, fixed hero ng-model, prepped heroes-controller for valve_id pathing
deleted old model and controllerfiles, removed unused activemodel serializer, deleted extra tests
fixed merge with pagination, portraits, and cleaner routes
Merge pull request #20 from theoretick/master

fixed merge with pagination, portraits, and cleaner routes
pulled from upstream