sync with Context as of 2013-11-29
update .gitignore