Merge pull request #1 from mgaeta/master

Correctly set mergeVars for render in templates api
push before backup
clean the way variables are set for templates
clean and fix api tests
Add args to template APIs for better customization
Merge branch 'develop' of https://github.com/mgaeta/lutung into develop

Conflicts:
	src/main/java/com/microtripit/mandrillapp/lutung/controller/MandrillMessagesApi.java
	src/main/java/com/microtripit/mandrillapp/lutung/controller/MandrillTemplatesApi.java
	src/main/java/com/microtripit/mandrillapp/lutung/controller/MandrillUtil.java