Bump versions on Bootstrap, LESSHat, Lo-Dash
Bump versions on Assemble, grunt-contrib-less, grunt-convert
Update CSS to fix starter-template example
Update CHANGELOG and bump Propeller version to 0.3.6
Fix conflicts