Merge pull request #34 from hrybacki/dev

Updated to match Citelet's fabric build process.