Merge pull request #43 from avaleske/develop

Merging to master
Merge branch 'develop'
Merge pull request #54 from avaleske/develop

merge develop to master
Merge pull request #56 from avaleske/develop

merge develop to staging
Merge pull request #57 from avaleske/staging

Staging
adding bit for production
Merge pull request #58 from avaleske/master

Master