Minor refactoring and cleaning out master branch to simple creating new branches with customizations.
Added .idea to .ignore
Removed .idea files