Cleaned up merge situations.
Add sessions functionality
Merge pull request #5 from gopher-snakes-2013/house-keeping

House keeping