Merge pull request #16 from magmaconf/2014

More changes added
6 hours less in the server time
Merge branch 'master' of github.com:magmaconf/cfp-magmarails-com into 2014