Merge pull request #128 from wiserstudios/master

Bootstrap 2/3 Compatibility