0.1.5 work needs to be migrated to work from master

[Aaron McCurry]

I have merged 0.1.5 into master, so for now please work from master while I
cleanup the old branches.  Thanks!

Aaron