merge w neil's
Merge branch 'HEAD' of https://github.com/cramja/stocktracker.git