Added index prefix
Upgrade phpunit, style fixes and changed default prefix to empty string
Merge branch 'lennynyktyk-develop' into develop
Remove warning since this has now been used quite a bit and seems stable
Resoved morge conflicts