various fixes n whatnot
Merge pull request #851 from brooksryba/develop

Remove console.log
Merge pull request #852 from Tendrid/develop

various fixes n whatnot