update travis links for build status
Merge branch 'master' of github.com:synapsestudios/heroine
Merge branch 'develop'
bug fix to factory loader