Merge pull request #9 from DoSomething/master

Merges master into dev for build (Wercker, Cap) config
Updates US TFJ URL for 2014-2015