Adjusted .gitignore and settings

adjusted files
Merge branch 'master' of https://github.com/bluedevil2k/Jiffy

Conflicts:
	WEB-INF/classes/config/jiffy.properties