Nearly complete changes...FS integration, bolus support, etc.
Merge pull request #17 from g33kgrrl/FSintegration

Nearly complete changes...FS integration, bolus support, etc.