WIP
Merge remote-tracking branch 'upstream/master'
Updated .gitignore

Automatic change by sorting file
And another stab at the .gitignore
Upating README.MD
Merge branch 'master' of github.com:fly-man-/Aurora-Sim
Update .gitignore

And another stab, seems we had some Opensimish things in there still
Merge pull request #139 from fly-man-/master

Aurora Bits and Pieces
Merge branch 'master' of git://github.com/aurora-sim/Aurora-Sim