eod 2013.05.27

Signed-off-by: codemac <j@codemac.net>
Merge branch 'master' of http://github.com/codemac/config