Punt on timestamp
Added CORS
Added V2 Requests API
Merge branch 'Tests' into timestamp

Conflicts:
	src/main/scala/controllers/Web.scala
	src/main/scala/services/Spitball.scala
Added V2 Requests API, and added time stamps
added werker file
updated wercker file
Fixed some merge bugs
working on wercker
removed cruft
added test step
more wercker vodo
wercking goodness
more yaml typos
things
I needed more tests
finished up some tests
cleaned up for pull requests
Update wercker.yml
Update wercker.yml