Update rc.conf.local options for OpenBSD 5.4
Merge remote-tracking branch 'upstream/master'
Update kernel path to $CDBOOTDIR/bsd
Merge pull request #64 from jordant/master

Update rc.conf.local options for OpenBSD 5.4 and Fix kernel path in iso build script