Attempting to fix issues on dev/prod
Merge pull request #32 from rexington/isimpledev-9oct

Attempting to fix issues on dev/prod