Conditional tag added.
Merge pull request #741 from Gravecorp/3.1.x.x

Conditional tag added.
bitch bitch bitch
Merge branch '3.1.x.x' of github.com:kellyelton/OCTGN into 3.1.x.x-proxygen
blergh
Cleaned up the octgn start up a bit.
Merge pull request #749 from kellyelton/3.1.x.x

3.1.x.x