removing now unused workaround
more checking
removing false errors
Merge pull request #128 from VirtualFlyBrain/Dev-Server

Adding deployment fixes from Dev
Merge pull request #129 from VirtualFlyBrain/master

Bring dev up to date