Fk bootstrap3 rebased

As I understood this is what the hold up is for #24 @fk's master rebased onto upstream master and all conflicts resolved.

Come on guys lets move along this has dragged on for long enough!