Merge branch '1.8' of git://github.com/Elgg/Elgg into lorea-preprod

diff --cc .gitignore
index bf64d4a49a98bcdc67fdd0f865f71f7dbf40170a,c0bba2c6c8de0b4200ae673629a1fc18f3d75d00..28bdb3e53cfbd5e47e84df9c8536e61bdaecf7c1
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,10 -1,9 +1,10 @@@
+ # ignore Elgg configuration
  /engine/settings.php
 +/engine/handlers/views_simplecache/*
  /.htaccess
- /.buildpath
- /.settings
- /.project
  /mod/*
+ 
+ # don't ignore bundled plugins
  !/mod/blog/
  !/mod/bookmarks/
  !/mod/categories/