Cleanup of OS1

Cleaned up the Output names and started working on condensing some of
the javascript.
Merge pull request #14 from pmosbach/master

Output name fixes