links to Python and Plain text sublime settings in skel project
add sublime settings for ubuntu (similar to Mac)
resolved some conflicts and moved all sublime settings to ubuntu
resolved gitignore conflicts
ignore merge conflict files BACKUP BASE REMOTE LOCAL