Propagate changes from gitorious
updated .gitignore