update gitignore
add ipython settings
add scala mode
merge master