Merge branch 'bug288_path_with_dot'
CDAT version at carriage return which messed up build_info file
Merge branch 'ipython_tornado_fix' into devel