Look for F# 3.1 version of FSI first
Merge branch 'develop' of github.com:tpetricek/FAKE into develop
Merge commit '96ffb8b' into develop

Conflicts:
	src/app/FAKE/app.config
Fixing typo
Merge commit 'f18c77b' into develop