Merge pull request #1 from ihistand/master

Moved to /opt
removed home references
Cleaned up move to /opt
Cleanup of opt move
Cleanup of opt move
Merge pull request #2 from badgeretl/master

Merge to top