Updated documentation and Bootstrap to 3.*
Release v0.1.2
Resolved merge conflicts