Use .gemfile <-> Gemfile (Thanks pessoa)

Squashed commit of the following

commit a8aabeca6f8ab14ff119f25d60e8407e2b82d983
Author: Pedro Pessoa <pedropessoa@boxedice.com>
Date:   Sun Feb 3 11:28:19 2013 +0000

    bad merge

commit 56c67f20ddd5a56ca5553a6eb8fd90d2382640f3
Author: Pedro Pessoa <pedropessoa@boxedice.com>
Date:   Sat Feb 2 17:45:42 2013 +0000

    use .gemfile to have Module Tool not pick it up

    Conflicts:

    	.travis.yml