lots of updates
Merge branch 'master' of y.github.com:yuttadhammo/meditation-plus