Bug fixes to Fetch layout
gitignore now in effect
Removed workspace from tracking
Resolved merge conflicts