Moved velocity templates under the right package
Code clean up and warning fixes
Moved images for wiki to gh-pages branch
Cleaned up log messages (Closes #58)
Merge #71 and #70