massive cleanup & changes
fixed missing application icon
Merge pull request #34 from madpew/cleanup

Cleanup as discussed in #33