updated java_home to jdk 1.7
Merge branch 'master' of github.com:vpatil/settings

Conflicts:
	.bashrc