Squashed merge from dev, code cleanup, README tuneup
Merge branch 'master' of github.com:nitstorm/headache-diary