Merge pull request #4 from swgillespie/sean

Merge all of our branches with master
Merge branch 'sean'
tsquare.core