Removing hard dependency on bootstrap
Merged with Master
Upgraded to latest on master branch; removed hard bootstrap-3 dependency