Various generic changes from use-mail
increase ruby requirement to 1.9.3
Merge branch 'develop' into use-mail