remove bad gitignore, add new gem, update api.rb
Merge branch 'controller' of github.com:dereksilverman/Future.me into controller

Conflicts:
	.gitignore
	log/development.log