Merge branch 'enable_tornado_ipython'
fix #288 dot in path
Merge branch 'bug288_path_with_dot' into devel