wip
Merge branch 'master' into twitter_server

Conflicts:
	src/main/scala/com/twitter/finatra/FinatraServer.scala
compiles and tests on scala2.10
small cleanups
whoa it builds
fixes
boots!
Merge branch 'pr/52' into twitter_server

Conflicts:
	pom.xml
	src/main/scala/com/twitter/finatra/FinatraServer.scala
2.10
cleanup
2.10 stuff
everything is broken
ugh
woot
fixes
config
working flags
flags working
Merge branch 'master' into twitter_server

Conflicts:
	pom.xml
	src/main/scala/com/twitter/finatra/Config.scala
	src/main/scala/com/twitter/finatra/FileService.scala
	src/main/scala/com/twitter/finatra/FinatraServer.scala
	src/main/scala/com/twitter/finatra/Logging.scala
	src/main/scala/com/twitter/finatra/View.scala
	src/test/scala/com/twitter/finatra/FinatraServerSpec.scala
compiles