Update bootstrap, add more fidouche functionality

Signed-off-by: Adam Lord <adam.lord@gmail.com>
Merge branch 'master' of https://github.com/adamtlord/foreverland