added new contact features
Merge branch 'master' of github.com:stopthespies/website
added conditional twitteR
fixed merge