.bashrc
	-Changed alias for emacs so it is unnafected by updates and launches the GUI

.emacs
	-removed that useless eclim stuff and added some comments
	-also added some config stuff for org mode