Restructured project.
Added abort-merge command.
Minor gs get-update fix.
Removed .DS_Store
Merge pull request #19 from buren/restructure

Restructure