some work to update the template.
Merge branch 'master' of https://github.com/ndlib/honeycomb

# By Robert Fox
# Via Jaron Kennel
* 'master' of https://github.com/ndlib/honeycomb:
  Remove all traces of spork
  Add spring enabled rspec
  Add support for spring
  Remove spork and zeus, and add spring support for guard
  Cherry pick commit: Add ignore for vendor bundle files and others