bit of refactoring, fixing thumbnails, and bower
merged down and resolved conflicts