small updates

Signed-off-by: Tim Traver <ttraver@mivamerchant.com>
Merge branch 'master' of http://github.com/timtraver/rcvault

Signed-off-by: Tim Traver <ttraver@mivamerchant.com>

Conflicts:
	todo.txt
quick format change

Signed-off-by: Tim Traver <ttraver@mivamerchant.com>