Merge commit 'origin'; remote branch 'origin/master'
Tue Feb  5 13:18:58 MST 2013 - Playing catchup. Modified installation to include optional 'experimental' routines. Also modified installation regarding secret key generation, backup etc.