Merge source in master.
Disqus margin fix.
Merge gitignore from source branch.