cleaned up for general use

mainly superficial renaming, commenting out file related stuff i dont
need yet.
Merge branch 'skatehub'