Working on 0.15.  Misc fixes, tweaks.
Merge pull request #8 from stancampbell3/0.15

Working on 0.15.  Misc fixes, tweaks.