emailer added
Merge branch 'geekhours_2014' of github.com:webonise/ror-geekhours into geekhours_2014