added eclipse crap to .gitignore
Merge branch 'dev' of https://github.com/iPlantCollaborativeOpenSource/Conrad into dev