fixed bug related to insecure assets request
update to upstream master
update gitignore
Merge pull request #266 from grbritz/master

Fixing bug on site when viewed with secure URL