change traffic sources to text field
Merge branch 'master' into move_traffic_sources
change travis ruby version
remove delegator
Merge pull request #964 from adrianob/move_traffic_sources

change traffic sources to text field