Replace refills with bootstrap
Resolve some conflicts
Merge pull request #18 from dahal/Bootstrap

Bootstrap