removing extra bundles and updating flash usage
Merge pull request #69 from mikeneiderhauser/master

defines instead of code block
Merge remote-tracking branch 'upstream/master'