Renaming classes so they don't conflict with makerstrap or bootstrap
Merge pull request #9 from vazquez/makerstrap-bootstrap-override-fixes

Renaming classes so they don't conflict with makerstrap or bootstrap