add java indentation=2
add ! in PS1 if login shell (bash)
add java8 info
Merge remote-tracking branch 'origin/master'