Merge pull request #36 from keaty/master

tweaked travis.yml settings
Merge pull request #37 from keaty/master

tweaked travis.yml settings
added industry to results
fixing gemfile
fixed HBO bug, only call for NYT results if parent has a name from freebase
fixed nil named parents, through testing for name
Merge pull request #38 from onweapps/master

Built industry into results
Refined the query to the NYTimes Articles API to return more relevant results.

* split up our ugly articlesearch function into smaller more oo functions inside application_controller.rb
* changed our query to v2 of Articles API - v1 is deprecated
* specified fields and filters (eg "Environment", "Cruelty") in our uri query
Merge pull request #39 from tyleraadams/bug/nyt_search_refinement

Refined the query to the NYTimes Articles API to return more relevant re...
Parent companies now returned in Array
Merge pull request #40 from onweapps/master

Parent companies now returned in Array
Edited view to accommodate new JSON response structure

* mainIndex.html divs have been tweaked to iterate correctly through the new structure
* application_controller.rb was changed to remove names from parent objects