Merge pull request #20 from sarlaf/working

separating test_vars into the spec helper.
 - looks great!
receive_texts controller
removed send_texts controller
some fb login stuff
twilio working and facebook working plus some bootstrap navbar stuff
some rebase error fixing
Merge pull request #22 from MiriamNeubauer/master

lgtm
changed application.rb for deploying to heroku.
updating spec for twilio name change.