add .gitignore
add maven encoding setting
Merge branch 'master' of github.com:hereticreader/dotfiles
gls => ls
update .bash_mac
add encrypted .ssh files
change git email
add CLASSPATH to current path
rebase master
Merge branch 'ca' of github.com:hereticreader/dotfiles into ca

Conflicts:
	.bash_mac