Add some conditionals for non-flash and nme
Merge pull request #903 from hughsando/dev

Add some conditionals for non-flash and nme