Update .gitignore
Merge branch 'mapstory' of github.com:opengeo/geonode into mapstory