Merge pull request #1 from pantheon-systems/develop

Change tabstop to 2
Remove debug code