Merge pull request #280 from wdouglass/master

Modify flash calculation functions to support 2MB devices
Merge pull request #281 from wdouglass/master

use correct SNB values for high flash pages on 2mb devices.