Fix whitespace
Merge branch 'master' of git://github.com/citrin2013/citrin