set up grunt
siq loader
merge master into gh-pages