Merge pull request #45 from jlipps/master

parse bootstrap imports into one file
1.7.0
add collectionView to list of scrollable things