Merge branch 'master' of https://github.com/dotproject/stable-2

git-svn-id: svn+ssh://svn.code.sf.net/p/dotproject/code/branches/stable_2@6224 c625438d-3aaf-4c84-a37d-fcf3134530f0
Updated ignore file to better handle /files/

git-svn-id: svn+ssh://svn.code.sf.net/p/dotproject/code/branches/stable_2@6225 c625438d-3aaf-4c84-a37d-fcf3134530f0
Quick update to description

git-svn-id: svn+ssh://svn.code.sf.net/p/dotproject/code/branches/stable_2@6226 c625438d-3aaf-4c84-a37d-fcf3134530f0
Merge branch 'master' of github.com:dotproject/stable-2