Merge pull request #245 from bradbishop/garrison-firestone

Basic support for Firestone and Garrison systems